From 74ab9465837f8a6f9eae854059e9783eff24e173 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期一, 14 七月 2025 18:06:24 +0800
Subject: [PATCH] 多组织修改
---
MES.Service/Modes/SalesReturnNoticeDetail.cs | 6
MES.Service/Dto/webApi/ErpCAB.cs | 4
MES.Service/Dto/service/WholeboardGenerateDto.cs | 427 +-
MES.Service/Dto/webApi/ErpDelivery.cs | 3
MES.Service/Modes/MesBarcodeType.cs | 320
MES.Service/service/GetErpParametersServer.cs | 11
MES.Service/Dto/service/SJPageResult.cs | 3
MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs | 58
MES.Service/service/Warehouse/MesInvItemOutsManager.cs | 70
MES.Service/Modes/MesQualityStandard.cs | 4
MES.Service/Modes/MesInvItemInCDetails2.cs | 660 +-
MES.Service/service/Warehouse/MesInvItemOutCDetailsManager.cs | 8
MES.Service/Modes/MesInvItemArn.cs | 304
MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs | 38
MES.Service/Dto/webApi/ErpRohinData.cs | 3
MES.Service/service/BasicData/MesDepotsManager.cs | 4
MES.Service/Modes/SysDepartment.cs | 1
MES.Service/Modes/MesInvItemMoves.cs | 224
MES.Service/Modes/SalesOrderDetail.cs | 15
MES.Service/Dto/webApi/ErpSalesDelivery.cs | 4
MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs | 396 +-
MES.Service/service/QC/SuspendService.cs | 21
MES.Service/service/QC/XJService.cs | 11
MESApplication/Controllers/BasicData/SalesOrderController.cs | 2
MES.Service/service/QC/PcbTestDataService.cs | 703 +-
MES.Service/Modes/MesDeliveryNoteBarcode.cs | 3
MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs | 26
MES.Service/Dto/service/SingleBoardGenerateDto.cs | 243
MES.Service/Dto/webApi/ErpSalesReturn.cs | 4
MES.Service/service/BasicData/SysDepartmentManager.cs | 3
MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs | 1
MES.Service/Modes/MesPcbTestData.cs | 343
MES.Service/Modes/Womcab.cs | 3
MES.Service/Dto/service/XJDto.cs | 1
MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs | 9
MESApplication/Controllers/BasicData/OrganizeController.cs | 491 +-
MESApplication/Controllers/BasicData/SalesDeliveryNoticeController.cs | 500 +-
MES.Service/Modes/MesDeliveryNote.cs | 3
MES.Service/service/BasicData/MesItemsManager.cs | 2
MES.Service/service/BasicData/SalesReturnNoticeManager.cs | 141
MESApplication/Controllers/BasicData/SalesDeliveryNoticeDetailController.cs | 308
MES.Service/Modes/Organize.cs | 8
MES.Service/service/BasicData/SalesOrderManager.cs | 79
MES.Service/Modes/MesPcbComponentData.cs | 153
MES.Service/Modes/SalesReturnNotice.cs | 460 +-
MES.Service/Dto/webApi/ErpDeliveryData.cs | 3
MES.Service/Modes/MesDepTaskInfo.cs | 448 +-
MES.Service/service/BasicData/MesStaffManager.cs | 29
MESApplication/Controllers/QC/PcbTestDataController.cs | 907 ++--
MES.Service/service/BasicData/MesRohInManager.cs | 8
MESApplication/Controllers/Base/LoginController.cs | 2
CLAUDE.md | 107
MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs | 49
MES.Service/service/QC/SJService.cs | 94
MES.Service/service/Warehouse/MesInvItemMovesManager.cs | 26
MES.Service/Modes/SalesOrder.cs | 5
MES.Service/service/BasicData/MesDeliveryNoteManager.cs | 48
MES.Service/service/WomcaaManager.cs | 93
MES.Service/service/WomcaaWWManager.cs | 76
MES.Service/Modes/MesInvItemInCItems.cs | 184
MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs | 3
MES.Service/Modes/Purdhb.cs | 352
MES.Service/service/BasicData/SalesDeliveryNoticeDetailManager.cs | 98
MES.Service/Dto/webApi/ErpOrganize.cs | 2
MES.Service/service/BasicData/MesCustomerManager.cs | 10
MES.Service/service/BasicData/OrganizeManager.cs | 9
MES.Service/Modes/Womcaa.cs | 3
MES.Service/service/BasicData/MesSupplierManager.cs | 6
MES.Service/service/Warehouse/OpeningReceiptServer.cs | 5
MES.Service/service/Warehouse/MesDepotSectionsManager.cs | 14
MES.Service/Dto/webApi/ErpPosition.cs | 2
MES.Service/Modes/MesDeliveryNoteDetails.cs | 3
MES.Service/Modes/Purdka.cs | 160
MES.Service/Modes/MesInvTransaction.cs | 96
MES.Service/Modes/MesQa.cs | 2
MESApplication/Controllers/QC/SJController.cs | 1
MESApplication/Controllers/WomcaaWWController.cs | 3
MES.Service/Modes/MesItems.cs | 2
MES.Service/Modes/MesQaItemsDetect01.cs | 422 +-
MES.Service/service/QC/RKJService.cs | 184
MES.Service/Dto/webApi/DelBarcode.cs | 2
MES.Service/Modes/MesInvBusiness2.cs | 288
MES.Service/Modes/MesQaItemsDetectDetail5.cs | 216
MES.Service/MES.Service.csproj | 4
MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs | 28
MES.Service/Modes/SalesDeliveryNotice.cs | 504 +-
MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs | 69
MESApplication/Controllers/QC/XJController.cs | 3
MES.Service/Modes/SalesDeliveryNoticeDetail.cs | 434 +-
MES.Service/service/Warehouse/MesInvItemArnManager.cs | 5
MESApplication/Controllers/QC/RKJController.cs | 2
MES.Service/Dto/webApi/ErpBarcode.cs | 3
MESApplication/Controllers/BasicData/MesDeliveryNoteDetails.cs | 3
93 files changed, 5,687 insertions(+), 5,411 deletions(-)
diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 0000000..8090d24
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,107 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+This is a Manufacturing Execution System (MES) built with .NET 8.0. The solution consists of two main projects:
+
+- **MES.Service**: Service layer containing business logic, data access, and DTOs
+- **MESApplication**: Web API application layer with controllers and HTTP endpoints
+
+## Database Environment
+
+Oracle Database 11g Enterprise Edition Release 11.2.0.1.0 - 64bit Production
+
+- PL/SQL Release 11.2.0.1.0 - Production
+- CORE 11.2.0.1.0 Production
+- TNS for 64-bit Windows: Version 11.2.0.1.0 - Production
+- NLSRTL Version 11.2.0.1.0 - Production
+
+**IMPORTANT**: All code must be compatible with Oracle 11g Release 11.2.0.1.0
+
+## Architecture
+
+### Database Layer
+- Uses **SqlSugar ORM** for data access with Oracle database
+- Connection string configured in `appsettings.json`
+- Two database contexts available:
+ - `DbContext<T>` (MES.Service/DB/DbContext.cs:10) - Generic repository pattern
+ - `SqlSugarHelper` (MES.Service/DB/SqlSugarHelper.cs:6) - Oracle-specific helper with transaction support
+
+### Service Layer Structure
+- **BasicData**: Core business entities (customers, items, suppliers, etc.)
+- **QC**: Quality control services (PCB testing, inspections)
+- **Warehouse**: Inventory management and warehouse operations
+- **Dto**: Data Transfer Objects split into:
+ - `service/`: Internal service DTOs
+ - `webApi/`: External API DTOs for ERP integration
+
+### API Layer
+- ASP.NET Core Web API with Swagger documentation
+- Controllers organized by domain (BasicData, QC, Warehouse)
+- Newtonsoft.Json for serialization with camelCase naming
+- CORS enabled for cross-origin requests
+- Custom ActionFilter for request/response handling
+
+## Common Development Commands
+
+### Build and Run
+```bash
+# Build the entire solution
+dotnet build
+
+# Build specific project
+dotnet build MESApplication/MESApplication.csproj
+dotnet build MES.Service/MES.Service.csproj
+
+# Run the web application
+dotnet run --project MESApplication
+
+# Run in specific configuration
+dotnet run --project MESApplication --configuration Release
+```
+
+### Development
+```bash
+# Restore NuGet packages
+dotnet restore
+
+# Clean build artifacts
+dotnet clean
+
+# Publish for deployment
+dotnet publish MESApplication -c Release -o ./publish
+```
+
+## Key Configuration
+
+### Database Connection
+- Oracle database connection configured in `appsettings.json`
+- Connection string: `AppSettings.DataBaseConn`
+- Database type switches between Oracle (SqlSugarHelper) and SqlServer (DbContext)
+
+### ERP Integration
+- Test URL: `AppSettings.TestErpUrl`
+- Production URL: `AppSettings.ProductionErpUrl`
+- Located in `MESApplication/appsettings.json`
+
+## Important Patterns
+
+### Repository Pattern
+Most business logic follows the Manager pattern:
+- Managers in `MES.Service/service/` handle business operations
+- Controllers in `MESApplication/Controllers/` handle HTTP requests
+- Models in `MES.Service/Modes/` represent database entities
+
+### Service Registration
+Services are manually instantiated rather than using dependency injection containers. When adding new services, follow the existing pattern in the respective Manager classes.
+
+### Error Handling
+- ActionFilter handles global request/response processing
+- SQL logging enabled via SqlSugar AOP for debugging
+- Console output for SQL query debugging
+
+## Testing
+
+No test projects are currently configured in this solution. When adding tests, create separate test projects following .NET testing conventions.
\ No newline at end of file
diff --git a/MES.Service/Dto/service/SJPageResult.cs b/MES.Service/Dto/service/SJPageResult.cs
index 8ca5e09..527911c 100644
--- a/MES.Service/Dto/service/SJPageResult.cs
+++ b/MES.Service/Dto/service/SJPageResult.cs
@@ -18,8 +18,7 @@
public string? FName { get; set; }
public string? Result { get; set; }
- [SugarColumn(IsIgnore = true)]
- public string? SearchValue { get; set; }
+ [SugarColumn(IsIgnore = true)] public string? SearchValue { get; set; }
[SugarColumn(ColumnName = "STATUS_USER")] //鐢ㄤ簬SqlSugar
public string? StatusUser { get; set; }
diff --git a/MES.Service/Dto/service/SingleBoardGenerateDto.cs b/MES.Service/Dto/service/SingleBoardGenerateDto.cs
index 2d3494a..c84690b 100644
--- a/MES.Service/Dto/service/SingleBoardGenerateDto.cs
+++ b/MES.Service/Dto/service/SingleBoardGenerateDto.cs
@@ -1,150 +1,147 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
+using Newtonsoft.Json;
-namespace MES.Service.Dto.service
+namespace MES.Service.Dto.service;
+
+/// <summary>
+/// 鎷兼澘(鍗曟澘)鐢熸垚鏁版嵁DTO
+/// </summary>
+public class SingleBoardGenerateDto
{
/// <summary>
- /// 鎷兼澘(鍗曟澘)鐢熸垚鏁版嵁DTO
+ /// 璁惧鍚嶇О
/// </summary>
- public class SingleBoardGenerateDto
- {
- /// <summary>
- /// 璁惧鍚嶇О
- /// </summary>
- [JsonPropertyName("device_name")]
- public string DeviceName { get; set; }
+ [JsonProperty("device_name")]
+ public string? DeviceName { get; set; }
- /// <summary>
- /// 鏁存澘鏉＄爜
- /// </summary>
- [JsonPropertyName("pcb_sn")]
- public string PcbSn { get; set; }
+ /// <summary>
+ /// 鏁存澘鏉＄爜
+ /// </summary>
+ [JsonProperty("pcb_sn")]
+ public string? PcbSn { get; set; }
- /// <summary>
- /// 杞ㄩ亾淇℃伅锛�1锛�1杞級锛�2锛�2杞級
- /// </summary>
- [JsonPropertyName("pcb_track_line")]
- public int PcbTrackLine { get; set; }
+ /// <summary>
+ /// 杞ㄩ亾淇℃伅锛�1锛�1杞級锛�2锛�2杞級
+ /// </summary>
+ [JsonProperty("pcb_track_line")]
+ public int PcbTrackLine { get; set; }
- /// <summary>
- /// 鏉块潰锛圱锛岄《闈級锛圔锛屽簳闈級锛圱+B锛屾澘闈�+搴曢潰锛�
- /// </summary>
- [JsonPropertyName("pcb_board_side")]
- public string PcbBoardSide { get; set; }
+ /// <summary>
+ /// 鏉块潰锛圱锛岄《闈級锛圔锛屽簳闈級锛圱+B锛屾澘闈�+搴曢潰锛�
+ /// </summary>
+ [JsonProperty("pcb_board_side")]
+ public string? PcbBoardSide { get; set; }
- /// <summary>
- /// 妫�娴嬫椂闂�
- /// </summary>
- [JsonPropertyName("pcb_test_time")]
- public string PcbTestTime { get; set; }
+ /// <summary>
+ /// 妫�娴嬫椂闂�
+ /// </summary>
+ [JsonProperty("pcb_test_time")]
+ public string? PcbTestTime { get; set; }
- /// <summary>
- /// 妫�娴嬭�楁椂锛屽崟浣嶇
- /// </summary>
- [JsonPropertyName("pcb_cycle_time")]
- public float PcbCycleTime { get; set; }
+ /// <summary>
+ /// 妫�娴嬭�楁椂锛屽崟浣嶇
+ /// </summary>
+ [JsonProperty("pcb_cycle_time")]
+ public float PcbCycleTime { get; set; }
- /// <summary>
- /// 绋嬪簭鍚�/鏉垮紡鍚�
- /// </summary>
- [JsonPropertyName("pcb_project_name")]
- public string PcbProjectName { get; set; }
+ /// <summary>
+ /// 绋嬪簭鍚�/鏉垮紡鍚�
+ /// </summary>
+ [JsonProperty("pcb_project_name")]
+ public string? PcbProjectName { get; set; }
- /// <summary>
- /// 鏁存澘妫�娴嬬粨鏋�
- /// </summary>
- [JsonPropertyName("pcb_robot_result")]
- public string PcbRobotResult { get; set; }
+ /// <summary>
+ /// 鏁存澘妫�娴嬬粨鏋�
+ /// </summary>
+ [JsonProperty("pcb_robot_result")]
+ public string? PcbRobotResult { get; set; }
- /// <summary>
- /// 鏁存澘澶嶅垽缁撴灉
- /// </summary>
- [JsonPropertyName("pcb_user_result")]
- public string PcbUserResult { get; set; }
+ /// <summary>
+ /// 鏁存澘澶嶅垽缁撴灉
+ /// </summary>
+ [JsonProperty("pcb_user_result")]
+ public string? PcbUserResult { get; set; }
- /// <summary>
- /// 鏁存澘鏈�缁堢粨鏋�
- /// </summary>
- [JsonPropertyName("pcb_final_result")]
- public string PcbFinalResult { get; set; }
+ /// <summary>
+ /// 鏁存澘鏈�缁堢粨鏋�
+ /// </summary>
+ [JsonProperty("pcb_final_result")]
+ public string? PcbFinalResult { get; set; }
- /// <summary>
- /// 缁翠慨绔欏鍒ょ敤鎴峰悕
- /// </summary>
- [JsonPropertyName("pcb_repair_user")]
- public string PcbRepairUser { get; set; }
+ /// <summary>
+ /// 缁翠慨绔欏鍒ょ敤鎴峰悕
+ /// </summary>
+ [JsonProperty("pcb_repair_user")]
+ public string? PcbRepairUser { get; set; }
- /// <summary>
- /// 鎷兼澘鏁伴噺
- /// </summary>
- [JsonPropertyName("pcb_board_number")]
- public int PcbBoardNumber { get; set; }
+ /// <summary>
+ /// 鎷兼澘鏁伴噺
+ /// </summary>
+ [JsonProperty("pcb_board_number")]
+ public int PcbBoardNumber { get; set; }
- /// <summary>
- /// 鍣ㄤ欢鎬绘暟閲�
- /// </summary>
- [JsonPropertyName("pcb_comp_number")]
- public int PcbCompNumber { get; set; }
+ /// <summary>
+ /// 鍣ㄤ欢鎬绘暟閲�
+ /// </summary>
+ [JsonProperty("pcb_comp_number")]
+ public int PcbCompNumber { get; set; }
- /// <summary>
- /// 鎷兼澘鏉＄爜
- /// </summary>
- [JsonPropertyName("board_sn")]
- public string BoardSn { get; set; }
+ /// <summary>
+ /// 鎷兼澘鏉＄爜
+ /// </summary>
+ [JsonProperty("board_sn")]
+ public string? BoardSn { get; set; }
- /// <summary>
- /// 鎷兼澘搴忓彿
- /// </summary>
- [JsonPropertyName("board_no")]
- public string BoardNo { get; set; }
+ /// <summary>
+ /// 鎷兼澘搴忓彿
+ /// </summary>
+ [JsonProperty("board_no")]
+ public string? BoardNo { get; set; }
- /// <summary>
- /// 鎷兼澘妫�娴嬬粨鏋�
- /// </summary>
- [JsonPropertyName("board_robot_result")]
- public string BoardRobotResult { get; set; }
+ /// <summary>
+ /// 鎷兼澘妫�娴嬬粨鏋�
+ /// </summary>
+ [JsonProperty("board_robot_result")]
+ public string? BoardRobotResult { get; set; }
- /// <summary>
- /// 鎷兼澘澶嶅垽缁撴灉
- /// </summary>
- [JsonPropertyName("board_user_result")]
- public string BoardUserResult { get; set; }
+ /// <summary>
+ /// 鎷兼澘澶嶅垽缁撴灉
+ /// </summary>
+ [JsonProperty("board_user_result")]
+ public string? BoardUserResult { get; set; }
- /// <summary>
- /// 鎷兼澘鏈�缁堢粨鏋�
- /// </summary>
- [JsonPropertyName("board_final_result")]
- public string BoardFinalResult { get; set; }
+ /// <summary>
+ /// 鎷兼澘鏈�缁堢粨鏋�
+ /// </summary>
+ [JsonProperty("board_final_result")]
+ public string? BoardFinalResult { get; set; }
- /// <summary>
- /// 鎷兼澘鍣ㄤ欢鏁伴噺
- /// </summary>
- [JsonPropertyName("board_comp_number")]
- public int BoardCompNumber { get; set; }
+ /// <summary>
+ /// 鎷兼澘鍣ㄤ欢鏁伴噺
+ /// </summary>
+ [JsonProperty("board_comp_number")]
+ public int BoardCompNumber { get; set; }
- /// <summary>
- /// 鎷兼澘鍣ㄤ欢妫�娴婲G鎬绘暟
- /// </summary>
- [JsonPropertyName("board_comp_robot_ng_number")]
- public int BoardCompRobotNgNumber { get; set; }
+ /// <summary>
+ /// 鎷兼澘鍣ㄤ欢妫�娴婲G鎬绘暟
+ /// </summary>
+ [JsonProperty("board_comp_robot_ng_number")]
+ public int BoardCompRobotNgNumber { get; set; }
- /// <summary>
- /// 鎷兼澘鍣ㄤ欢澶嶅垽NG鎬绘暟
- /// </summary>
- [JsonPropertyName("board_comp_user_ng_number")]
- public int BoardCompUserNgNumber { get; set; }
+ /// <summary>
+ /// 鎷兼澘鍣ㄤ欢澶嶅垽NG鎬绘暟
+ /// </summary>
+ [JsonProperty("board_comp_user_ng_number")]
+ public int BoardCompUserNgNumber { get; set; }
- /// <summary>
- /// 鎷兼澘鍣ㄤ欢璇姤鎬绘暟
- /// </summary>
- [JsonPropertyName("board_comp_repass_number")]
- public int BoardCompRepassNumber { get; set; }
+ /// <summary>
+ /// 鎷兼澘鍣ㄤ欢璇姤鎬绘暟
+ /// </summary>
+ [JsonProperty("board_comp_repass_number")]
+ public int BoardCompRepassNumber { get; set; }
- /// <summary>
- /// 鍣ㄤ欢鍒楄〃
- /// </summary>
- [JsonPropertyName("comp_data")]
- public List<ComponentDataDto> CompData { get; set; }
- }
+ /// <summary>
+ /// 鍣ㄤ欢鍒楄〃
+ /// </summary>
+ [JsonProperty("comp_data")]
+ public List<ComponentDataDto>? CompData { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/WholeboardGenerateDto.cs b/MES.Service/Dto/service/WholeboardGenerateDto.cs
index 66644dd..3dbca15 100644
--- a/MES.Service/Dto/service/WholeboardGenerateDto.cs
+++ b/MES.Service/Dto/service/WholeboardGenerateDto.cs
@@ -1,234 +1,231 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
+using Newtonsoft.Json;
-namespace MES.Service.Dto.service
+namespace MES.Service.Dto.service;
+
+/// <summary>
+/// 鏁存澘鐢熸垚鏁版嵁DTO
+/// </summary>
+public class WholeboardGenerateDto
{
/// <summary>
- /// 鏁存澘鐢熸垚鏁版嵁DTO
+ /// 璁惧鍚嶇О
/// </summary>
- public class WholeboardGenerateDto
- {
- /// <summary>
- /// 璁惧鍚嶇О
- /// </summary>
- [JsonPropertyName("device_name")]
- public string DeviceName { get; set; }
-
- /// <summary>
- /// 鏁存澘鏉＄爜
- /// </summary>
- [JsonPropertyName("pcb_sn")]
- public string PcbSn { get; set; }
-
- /// <summary>
- /// 杞ㄩ亾淇℃伅锛�1锛�1杞級锛�2锛�2杞級
- /// </summary>
- [JsonPropertyName("pcb_track_line")]
- public int PcbTrackLine { get; set; }
-
- /// <summary>
- /// 鏉块潰锛圱锛岄《闈級锛圔锛屽簳闈級锛圱+B锛屾澘闈�+搴曢潰锛�
- /// </summary>
- [JsonPropertyName("pcb_board_side")]
- public string PcbBoardSide { get; set; }
-
- /// <summary>
- /// 妫�娴嬫椂闂达紝鏍煎紡yyyy-mm-dd hh:mm:ss
- /// </summary>
- [JsonPropertyName("pcb_test_time")]
- public string PcbTestTime { get; set; }
-
- /// <summary>
- /// 妫�娴嬭�楁椂锛屽崟浣嶇
- /// </summary>
- [JsonPropertyName("pcb_cycle_time")]
- public float PcbCycleTime { get; set; }
-
- /// <summary>
- /// 绋嬪簭鍚�/鏉垮紡鍚�
- /// </summary>
- [JsonPropertyName("pcb_project_name")]
- public string PcbProjectName { get; set; }
-
- /// <summary>
- /// 鏁存澘妫�娴嬬粨鏋�
- /// </summary>
- [JsonPropertyName("pcb_robot_result")]
- public string PcbRobotResult { get; set; }
-
- /// <summary>
- /// 鏁存澘澶嶅垽缁撴灉
- /// </summary>
- [JsonPropertyName("pcb_user_result")]
- public string PcbUserResult { get; set; }
-
- /// <summary>
- /// 鏁存澘鏈�缁堢粨鏋�
- /// </summary>
- [JsonPropertyName("pcb_final_result")]
- public string PcbFinalResult { get; set; }
-
- /// <summary>
- /// 缁翠慨绔欏鍒ょ敤鎴峰悕
- /// </summary>
- [JsonPropertyName("pcb_repair_user")]
- public string PcbRepairUser { get; set; }
-
- /// <summary>
- /// 鎷兼澘鏁伴噺
- /// </summary>
- [JsonPropertyName("pcb_board_number")]
- public int PcbBoardNumber { get; set; }
-
- /// <summary>
- /// 鎷兼澘妫�娴婲G鏁伴噺
- /// </summary>
- [JsonPropertyName("pcb_board_robot_ng_number")]
- public int PcbBoardRobotNgNumber { get; set; }
-
- /// <summary>
- /// 鎷兼澘澶嶅垽NG鏁伴噺
- /// </summary>
- [JsonPropertyName("pcb_board_user_ng_number")]
- public int PcbBoardUserNgNumber { get; set; }
-
- /// <summary>
- /// 鎷兼澘璇姤鏁伴噺
- /// </summary>
- [JsonPropertyName("pcb_board_repass_number")]
- public int PcbBoardRepassNumber { get; set; }
-
- /// <summary>
- /// 鍣ㄤ欢鎬绘暟閲�
- /// </summary>
- [JsonPropertyName("pcb_comp_number")]
- public int PcbCompNumber { get; set; }
-
- /// <summary>
- /// 鍣ㄤ欢妫�娴婲G鏁伴噺
- /// </summary>
- [JsonPropertyName("pcb_comp_robot_ng_number")]
- public int PcbCompRobotNgNumber { get; set; }
-
- /// <summary>
- /// 鍣ㄤ欢澶嶅垽NG鏁伴噺
- /// </summary>
- [JsonPropertyName("pcb_comp_user_ng_number")]
- public int PcbCompUserNgNumber { get; set; }
-
- /// <summary>
- /// 鍣ㄤ欢璇姤鏁伴噺
- /// </summary>
- [JsonPropertyName("pcb_comp_repass_number")]
- public int PcbCompRepassNumber { get; set; }
-
- /// <summary>
- /// 鎷兼澘鍒楄〃
- /// </summary>
- [JsonPropertyName("board_data")]
- public List<BoardDataDto> BoardData { get; set; }
- }
+ [JsonProperty("device_name")]
+ public string? DeviceName { get; set; }
/// <summary>
- /// 鎷兼澘鏁版嵁DTO
+ /// 鏁存澘鏉＄爜
/// </summary>
- public class BoardDataDto
- {
- /// <summary>
- /// 鎷兼澘鏉＄爜
- /// </summary>
- [JsonPropertyName("board_sn")]
- public string BoardSn { get; set; }
-
- /// <summary>
- /// 鎷兼澘搴忓彿
- /// </summary>
- [JsonPropertyName("board_no")]
- public string BoardNo { get; set; }
-
- /// <summary>
- /// 鎷兼澘妫�娴嬬粨鏋�
- /// </summary>
- [JsonPropertyName("board_robot_result")]
- public string BoardRobotResult { get; set; }
-
- /// <summary>
- /// 鎷兼澘澶嶅垽缁撴灉
- /// </summary>
- [JsonPropertyName("board_user_result")]
- public string BoardUserResult { get; set; }
-
- /// <summary>
- /// 鎷兼澘鏈�缁堢粨鏋�
- /// </summary>
- [JsonPropertyName("board_final_result")]
- public string BoardFinalResult { get; set; }
-
- /// <summary>
- /// 鍣ㄤ欢鍒楄〃
- /// </summary>
- [JsonPropertyName("comp_data")]
- public List<ComponentDataDto> CompData { get; set; }
- }
+ [JsonProperty("pcb_sn")]
+ public string? PcbSn { get; set; }
/// <summary>
- /// 鍣ㄤ欢鏁版嵁DTO
+ /// 杞ㄩ亾淇℃伅锛�1锛�1杞級锛�2锛�2杞級
/// </summary>
- public class ComponentDataDto
- {
- /// <summary>
- /// 鍣ㄤ欢浣嶅彿
- /// </summary>
- [JsonPropertyName("comp_designator")]
- public string CompDesignator { get; set; }
+ [JsonProperty("pcb_track_line")]
+ public int PcbTrackLine { get; set; }
- /// <summary>
- /// 鍣ㄤ欢鏂欏彿
- /// </summary>
- [JsonPropertyName("comp_part")]
- public string CompPart { get; set; }
+ /// <summary>
+ /// 鏉块潰锛圱锛岄《闈級锛圔锛屽簳闈級锛圱+B锛屾澘闈�+搴曢潰锛�
+ /// </summary>
+ [JsonProperty("pcb_board_side")]
+ public string? PcbBoardSide { get; set; }
- /// <summary>
- /// 鍣ㄤ欢灏佽
- /// </summary>
- [JsonPropertyName("comp_package")]
- public string CompPackage { get; set; }
+ /// <summary>
+ /// 妫�娴嬫椂闂达紝鏍煎紡yyyy-mm-dd hh:mm:ss
+ /// </summary>
+ [JsonProperty("pcb_test_time")]
+ public string? PcbTestTime { get; set; }
- /// <summary>
- /// 鍣ㄤ欢绫诲瀷
- /// </summary>
- [JsonPropertyName("comp_type")]
- public string CompType { get; set; }
+ /// <summary>
+ /// 妫�娴嬭�楁椂锛屽崟浣嶇
+ /// </summary>
+ [JsonProperty("pcb_cycle_time")]
+ public float PcbCycleTime { get; set; }
- /// <summary>
- /// 鍣ㄤ欢妫�娴嬩笉鑹唬鐮�
- /// </summary>
- [JsonPropertyName("comp_robot_code")]
- public string CompRobotCode { get; set; }
+ /// <summary>
+ /// 绋嬪簭鍚�/鏉垮紡鍚�
+ /// </summary>
+ [JsonProperty("pcb_project_name")]
+ public string? PcbProjectName { get; set; }
- /// <summary>
- /// 鍣ㄤ欢妫�娴嬬粨鏋�
- /// </summary>
- [JsonPropertyName("comp_robot_result")]
- public string CompRobotResult { get; set; }
+ /// <summary>
+ /// 鏁存澘妫�娴嬬粨鏋�
+ /// </summary>
+ [JsonProperty("pcb_robot_result")]
+ public string? PcbRobotResult { get; set; }
- /// <summary>
- /// 鍣ㄤ欢澶嶅垽涓嶈壇浠ｇ爜
- /// </summary>
- [JsonPropertyName("comp_user_code")]
- public string CompUserCode { get; set; }
+ /// <summary>
+ /// 鏁存澘澶嶅垽缁撴灉
+ /// </summary>
+ [JsonProperty("pcb_user_result")]
+ public string? PcbUserResult { get; set; }
- /// <summary>
- /// 鍣ㄤ欢澶嶅垽缁撴灉
- /// </summary>
- [JsonPropertyName("comp_user_result")]
- public string CompUserResult { get; set; }
+ /// <summary>
+ /// 鏁存澘鏈�缁堢粨鏋�
+ /// </summary>
+ [JsonProperty("pcb_final_result")]
+ public string? PcbFinalResult { get; set; }
- /// <summary>
- /// 鍣ㄤ欢鍥剧墖鍦板潃
- /// </summary>
- [JsonPropertyName("comp_image")]
- public string CompImage { get; set; }
- }
+ /// <summary>
+ /// 缁翠慨绔欏鍒ょ敤鎴峰悕
+ /// </summary>
+ [JsonProperty("pcb_repair_user")]
+ public string? PcbRepairUser { get; set; }
+
+ /// <summary>
+ /// 鎷兼澘鏁伴噺
+ /// </summary>
+ [JsonProperty("pcb_board_number")]
+ public int PcbBoardNumber { get; set; }
+
+ /// <summary>
+ /// 鎷兼澘妫�娴婲G鏁伴噺
+ /// </summary>
+ [JsonProperty("pcb_board_robot_ng_number")]
+ public int PcbBoardRobotNgNumber { get; set; }
+
+ /// <summary>
+ /// 鎷兼澘澶嶅垽NG鏁伴噺
+ /// </summary>
+ [JsonProperty("pcb_board_user_ng_number")]
+ public int PcbBoardUserNgNumber { get; set; }
+
+ /// <summary>
+ /// 鎷兼澘璇姤鏁伴噺
+ /// </summary>
+ [JsonProperty("pcb_board_repass_number")]
+ public int PcbBoardRepassNumber { get; set; }
+
+ /// <summary>
+ /// 鍣ㄤ欢鎬绘暟閲�
+ /// </summary>
+ [JsonProperty("pcb_comp_number")]
+ public int PcbCompNumber { get; set; }
+
+ /// <summary>
+ /// 鍣ㄤ欢妫�娴婲G鏁伴噺
+ /// </summary>
+ [JsonProperty("pcb_comp_robot_ng_number")]
+ public int PcbCompRobotNgNumber { get; set; }
+
+ /// <summary>
+ /// 鍣ㄤ欢澶嶅垽NG鏁伴噺
+ /// </summary>
+ [JsonProperty("pcb_comp_user_ng_number")]
+ public int PcbCompUserNgNumber { get; set; }
+
+ /// <summary>
+ /// 鍣ㄤ欢璇姤鏁伴噺
+ /// </summary>
+ [JsonProperty("pcb_comp_repass_number")]
+ public int PcbCompRepassNumber { get; set; }
+
+ /// <summary>
+ /// 鎷兼澘鍒楄〃
+ /// </summary>
+ [JsonProperty("board_data")]
+ public List<BoardDataDto> BoardData { get; set; } = new List<BoardDataDto>();
+}
+
+/// <summary>
+/// 鎷兼澘鏁版嵁DTO
+/// </summary>
+public class BoardDataDto
+{
+ /// <summary>
+ /// 鎷兼澘鏉＄爜
+ /// </summary>
+ [JsonProperty("board_sn")]
+ public string? BoardSn { get; set; }
+
+ /// <summary>
+ /// 鎷兼澘搴忓彿
+ /// </summary>
+ [JsonProperty("board_no")]
+ public string? BoardNo { get; set; }
+
+ /// <summary>
+ /// 鎷兼澘妫�娴嬬粨鏋�
+ /// </summary>
+ [JsonProperty("board_robot_result")]
+ public string? BoardRobotResult { get; set; }
+
+ /// <summary>
+ /// 鎷兼澘澶嶅垽缁撴灉
+ /// </summary>
+ [JsonProperty("board_user_result")]
+ public string? BoardUserResult { get; set; }
+
+ /// <summary>
+ /// 鎷兼澘鏈�缁堢粨鏋�
+ /// </summary>
+ [JsonProperty("board_final_result")]
+ public string? BoardFinalResult { get; set; }
+
+ /// <summary>
+ /// 鍣ㄤ欢鍒楄〃
+ /// </summary>
+ [JsonProperty("comp_data")]
+ public List<ComponentDataDto>? CompData { get; set; }
+}
+
+/// <summary>
+/// 鍣ㄤ欢鏁版嵁DTO
+/// </summary>
+public class ComponentDataDto
+{
+ /// <summary>
+ /// 鍣ㄤ欢浣嶅彿
+ /// </summary>
+ [JsonProperty("comp_designator")]
+ public string? CompDesignator { get; set; }
+
+ /// <summary>
+ /// 鍣ㄤ欢鏂欏彿
+ /// </summary>
+ [JsonProperty("comp_part")]
+ public string? CompPart { get; set; }
+
+ /// <summary>
+ /// 鍣ㄤ欢灏佽
+ /// </summary>
+ [JsonProperty("comp_package")]
+ public string? CompPackage { get; set; }
+
+ /// <summary>
+ /// 鍣ㄤ欢绫诲瀷
+ /// </summary>
+ [JsonProperty("comp_type")]
+ public string? CompType { get; set; }
+
+ /// <summary>
+ /// 鍣ㄤ欢妫�娴嬩笉鑹唬鐮�
+ /// </summary>
+ [JsonProperty("comp_robot_code")]
+ public string? CompRobotCode { get; set; }
+
+ /// <summary>
+ /// 鍣ㄤ欢妫�娴嬬粨鏋�
+ /// </summary>
+ [JsonProperty("comp_robot_result")]
+ public string? CompRobotResult { get; set; }
+
+ /// <summary>
+ /// 鍣ㄤ欢澶嶅垽涓嶈壇浠ｇ爜
+ /// </summary>
+ [JsonProperty("comp_user_code")]
+ public string? CompUserCode { get; set; }
+
+ /// <summary>
+ /// 鍣ㄤ欢澶嶅垽缁撴灉
+ /// </summary>
+ [JsonProperty("comp_user_result")]
+ public string? CompUserResult { get; set; }
+
+ /// <summary>
+ /// 鍣ㄤ欢鍥剧墖鍦板潃
+ /// </summary>
+ [JsonProperty("comp_image")]
+ public string? CompImage { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/XJDto.cs b/MES.Service/Dto/service/XJDto.cs
index b2b3ec0..1b2065e 100644
--- a/MES.Service/Dto/service/XJDto.cs
+++ b/MES.Service/Dto/service/XJDto.cs
@@ -19,6 +19,7 @@
public string? Remarks { get; set; }
public string? Comments { get; set; }
+
//==========================================
//宸℃涓诲瓙琛ㄩ渶瑕佺殑鏁版嵁
public QsQaItemXj? from { get; set; }
diff --git a/MES.Service/Dto/webApi/DelBarcode.cs b/MES.Service/Dto/webApi/DelBarcode.cs
index eda3f18..1c08adc 100644
--- a/MES.Service/Dto/webApi/DelBarcode.cs
+++ b/MES.Service/Dto/webApi/DelBarcode.cs
@@ -3,4 +3,4 @@
public class DelBarcode
{
public string SmallBarcode { get; set; }
-}
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpBarcode.cs b/MES.Service/Dto/webApi/ErpBarcode.cs
index 4bf2677..398d99a 100644
--- a/MES.Service/Dto/webApi/ErpBarcode.cs
+++ b/MES.Service/Dto/webApi/ErpBarcode.cs
@@ -1,4 +1,5 @@
锘縩amespace MES.Service.Dto.webApi;
+
public class ErpBarcode
{
public string? Type { get; set; }
@@ -8,4 +9,4 @@
public string? SmallBarcode { get; set; }
public string? IncludeQty { get; set; }
public string? SupplierId { get; set; }
-}
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpCAB.cs b/MES.Service/Dto/webApi/ErpCAB.cs
index e6c9376..7f4d573 100644
--- a/MES.Service/Dto/webApi/ErpCAB.cs
+++ b/MES.Service/Dto/webApi/ErpCAB.cs
@@ -27,11 +27,11 @@
public string? FScrapRate { get; set; }
public string? FSALEORDERNO { get; set; }
public string? F_ZJXF_YHRQ { get; set; } //瑕佽揣鏃ユ湡
- public string? FXSHTBH { get; set; } //閿�鍞鍗曞彿
+ public string? FXSHTBH { get; set; } //閿�鍞鍗曞彿
public string? FReplaceGroup { get; set; }
public string? FOwnerTypeId { get; set; }
public string? FMaterialType { get; set; }
public string? F_ZJXF_SSGX { get; set; } //鐢熶骇宸ュ簭
- public string? F_WWC_TEXT { get; set; } //閿�鍞崟鍙�
+ public string? F_WWC_TEXT { get; set; } //閿�鍞崟鍙�
public string? F_ZJXF_HSDJ { get; set; } //鍚◣鍗曚环
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpDelivery.cs b/MES.Service/Dto/webApi/ErpDelivery.cs
index 4aba2ee..8ee54b8 100644
--- a/MES.Service/Dto/webApi/ErpDelivery.cs
+++ b/MES.Service/Dto/webApi/ErpDelivery.cs
@@ -1,4 +1,5 @@
锘縩amespace MES.Service.Dto.webApi;
+
public class ErpDelivery
{
public string? Type { get; set; }
@@ -8,4 +9,4 @@
public string? Remark { get; set; }
public string? SupplierId { get; set; }
public string? ErpId { get; set; }
-}
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpDeliveryData.cs b/MES.Service/Dto/webApi/ErpDeliveryData.cs
index a4a6030..9fdc924 100644
--- a/MES.Service/Dto/webApi/ErpDeliveryData.cs
+++ b/MES.Service/Dto/webApi/ErpDeliveryData.cs
@@ -1,4 +1,5 @@
锘縩amespace MES.Service.Dto.webApi;
+
public class ErpDeliveryData
{
public string? LineNo { get; set; }
@@ -13,4 +14,4 @@
public string? InventoryUnit { get; set; }
public string? FXSHTH { get; set; }
public string? Remark { get; set; }
-}
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpOrganize.cs b/MES.Service/Dto/webApi/ErpOrganize.cs
index ca4cd28..54270cd 100644
--- a/MES.Service/Dto/webApi/ErpOrganize.cs
+++ b/MES.Service/Dto/webApi/ErpOrganize.cs
@@ -12,6 +12,4 @@
public string? fCreateDate { get; set; }
public string? FForbidorid { get; set; }
public string? FForbiddate { get; set; }
-
-
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpPosition.cs b/MES.Service/Dto/webApi/ErpPosition.cs
index 4eece24..e66ea06 100644
--- a/MES.Service/Dto/webApi/ErpPosition.cs
+++ b/MES.Service/Dto/webApi/ErpPosition.cs
@@ -2,8 +2,10 @@
public class ErpPosition
{
+ public string Id { get; set; }
public string Id { get; set; }
+ /// </summary>
public string? Type { get; set; }
public string? FNumber { get; set; }
public string? FName { get; set; }
diff --git a/MES.Service/Dto/webApi/ErpRohinData.cs b/MES.Service/Dto/webApi/ErpRohinData.cs
index c75827f..da9d172 100644
--- a/MES.Service/Dto/webApi/ErpRohinData.cs
+++ b/MES.Service/Dto/webApi/ErpRohinData.cs
@@ -15,13 +15,16 @@
public string? FPriceUnitQty { get; set; }
public string? FDeliveryDate { get; set; }
public string? FDeliveryEarlyDate { get; set; }
+
public string? FDeliveryLastDate { get; set; }
+
// start
public string? FRequireOrgId { get; set; }
public string? FRequireDeptId { get; set; }
public string? FReceiveOrgId { get; set; }
public string? FReceiveDeptId { get; set; }
public string? Fsettleorgid { get; set; }
+
// end
public string? FGiveAway { get; set; }
public string? FNote { get; set; }
diff --git a/MES.Service/Dto/webApi/ErpSalesDelivery.cs b/MES.Service/Dto/webApi/ErpSalesDelivery.cs
index a6559c8..1da91a0 100644
--- a/MES.Service/Dto/webApi/ErpSalesDelivery.cs
+++ b/MES.Service/Dto/webApi/ErpSalesDelivery.cs
@@ -1,6 +1,4 @@
-锘縰sing MES.Service.Modes;
-
-namespace MES.Service.Dto.webApi;
+锘縩amespace MES.Service.Dto.webApi;
public class ErpSalesDelivery
{
diff --git a/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs b/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
index 59c7476..5ca4616 100644
--- a/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesDeliveryDetailDto.cs
@@ -3,43 +3,42 @@
public class ErpSalesDeliveryDetailDto
{
public string? Type { get; set; }
- public string? FMaterialId { get; set; } // 鐗╂枡缂栫爜
- public string? FUnitID { get; set; } // 閿�鍞崟浣�
- public string? FQty { get; set; } // 閿�鍞暟閲�
- public string? FIsFree { get; set; } // 鏄惁璧犲搧
- public string? FDeliverydate { get; set; } // 閫�璐ф棩鏈�
- public string? FStockId { get; set; } // 浠撳簱
- public string? FMtoNo { get; set; } // 璁″垝璺熻釜鍙�
- public string? FLot { get; set; } // 鎵瑰彿
- public string? FStockUnitID { get; set; } // 搴撳瓨鍗曚綅
- public decimal? FStockQty { get; set; } // 搴撳瓨鏁伴噺
- public string? FOwnerTypeID { get; set; } // 璐т富绫诲瀷
- public string? FOwnerId { get; set; } // 璐т富
- public string? FSrcType { get; set; } // 婧愬崟绫诲瀷
- public string? FSrcBillNo { get; set; } // 婧愬崟缂栧彿
- public string? FOrderNo { get; set; } // 璁㈠崟鍗曞彿
+ public string? FMaterialId { get; set; } // 鐗╂枡缂栫爜
+ public string? FUnitID { get; set; } // 閿�鍞崟浣�
+ public string? FQty { get; set; } // 閿�鍞暟閲�
+ public string? FIsFree { get; set; } // 鏄惁璧犲搧
+ public string? FDeliverydate { get; set; } // 閫�璐ф棩鏈�
+ public string? FStockId { get; set; } // 浠撳簱
+ public string? FMtoNo { get; set; } // 璁″垝璺熻釜鍙�
+ public string? FLot { get; set; } // 鎵瑰彿
+ public string? FStockUnitID { get; set; } // 搴撳瓨鍗曚綅
+ public decimal? FStockQty { get; set; } // 搴撳瓨鏁伴噺
+ public string? FOwnerTypeID { get; set; } // 璐т富绫诲瀷
+ public string? FOwnerId { get; set; } // 璐т富
+ public string? FSrcType { get; set; } // 婧愬崟绫诲瀷
+ public string? FSrcBillNo { get; set; } // 婧愬崟缂栧彿
+ public string? FOrderNo { get; set; } // 璁㈠崟鍗曞彿
- public decimal? FPriceUnitQty { get; set; } // 璁′环鏁伴噺
- public string? FOwnerIdHead { get; set; } // 璐т富
+ public decimal? FPriceUnitQty { get; set; } // 璁′环鏁伴噺
+ public string? FOwnerIdHead { get; set; } // 璐т富
- public string? FPlanDeliveryDate { get; set; } //璁″垝鍙戣揣鏃ユ湡
- public string? FOutLmtUnit { get; set; } // 瓒呭彂鎺у埗鍗曚綅
- public decimal? FOutMaxQty { get; set; } // 鍑哄簱涓婇檺
- public decimal? FOutMinQty { get; set; } // 鍑哄簱涓嬮檺
- public string? FDeliveryLoc { get; set; } // 浜よ揣鍦扮偣
- public string? FDeliveryLAddress { get; set; } // 浜よ揣鍦板潃
- public string? FTerminationStatus { get; set; } // 缁堟鐘舵��
- public string? FTerminateDate { get; set; } // 涓氬姟缁堟鏃ユ湡
- public decimal? FSumOutQty { get; set; } // 绱鍑哄簱鏁伴噺
- public decimal? FRemainOutQty { get; set; } // 鏈嚭搴撴暟閲�
+ public string? FPlanDeliveryDate { get; set; } //璁″垝鍙戣揣鏃ユ湡
+ public string? FOutLmtUnit { get; set; } // 瓒呭彂鎺у埗鍗曚綅
+ public decimal? FOutMaxQty { get; set; } // 鍑哄簱涓婇檺
+ public decimal? FOutMinQty { get; set; } // 鍑哄簱涓嬮檺
+ public string? FDeliveryLoc { get; set; } // 浜よ揣鍦扮偣
+ public string? FDeliveryLAddress { get; set; } // 浜よ揣鍦板潃
+ public string? FTerminationStatus { get; set; } // 缁堟鐘舵��
+ public string? FTerminateDate { get; set; } // 涓氬姟缁堟鏃ユ湡
+ public decimal? FSumOutQty { get; set; } // 绱鍑哄簱鏁伴噺
+ public decimal? FRemainOutQty { get; set; } // 鏈嚭搴撴暟閲�
- public string? ErpID { get; set; } // ERPID
- public string? EHID { get; set; } // ERP澶碔D
+ public string? ErpID { get; set; } // ERPID
+ public string? EHID { get; set; } // ERP澶碔D
- public string? FXSHTH { get; set; } // 閿�鍞鍗曞彿
- public string? F_ZJXF_TEXT_QTR_LEE { get; set; } // 瀹㈡埛璁㈠崟鍙�
- public string? FXSHTBH { get; set; } // 閿�鍞悎鍚岀紪鍙�
- public string? F_KHWLMC { get; set; } // 瀹㈡埛鐗╂枡鍚嶇О
- public string? F_KHWLBM { get; set; } // 瀹㈡埛鐗╂枡缂栫爜
-
+ public string? FXSHTH { get; set; } // 閿�鍞鍗曞彿
+ public string? F_ZJXF_TEXT_QTR_LEE { get; set; } // 瀹㈡埛璁㈠崟鍙�
+ public string? FXSHTBH { get; set; } // 閿�鍞悎鍚岀紪鍙�
+ public string? F_KHWLMC { get; set; } // 瀹㈡埛鐗╂枡鍚嶇О
+ public string? F_KHWLBM { get; set; } // 瀹㈡埛鐗╂枡缂栫爜
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs b/MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs
index e89990f..a325266 100644
--- a/MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesDeliveryDto.cs
@@ -39,5 +39,4 @@
public string? FCancellerId { get; set; } // 浣滃簾浜�
public string? FCancelDate { get; set; } // 浣滃簾鏃ユ湡
public string? FDocumentStatus { get; set; } // 鍗曟嵁鐘舵��
-
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs b/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
index d109203..91aca35 100644
--- a/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesOrdeDetailDto.cs
@@ -2,35 +2,35 @@
public class ErpSalesOrderDetailDto
{
- public string? FMaterialId { get; set; } // 鐗╂枡缂栫爜
- public string? FUnitID { get; set; } // 閿�鍞崟浣�
- public string? FQty { get; set; } // 閿�鍞暟閲�
- public string? FPriceUnitId { get; set; } // 璁′环鍗曚綅
- public string? FPriceUnitQty { get; set; } // 璁′环鏁伴噺
- public string? FDeliveryDate { get; set; } // 瑕佽揣鏃ユ湡
- public string? FIsFree { get; set; } // 鏄惁璧犲搧
- public string? FOwnerTypeId { get; set; } // 璐т富绫诲瀷
- public string? FOwnerId { get; set; } // 璐т富
- public string? FEntryNote { get; set; } // 澶囨敞
- public string? FMtoNo { get; set; } // 璁″垝璺熻釜鍙�
- public string? FLot { get; set; } // 鎵瑰彿
- public string? FDeliveryMaxQty { get; set; } // 鍙戣揣涓婇檺
- public string? FDeliveryMinQty { get; set; } // 鍙戣揣涓嬮檺
- public string? FOutLmtUnitID { get; set; } // 瓒呭彂鎺у埗鍗曚綅
- public string? FMrpCloseStatus { get; set; } // 涓氬姟鍏抽棴
- public string? FMrpTerminateStatus { get; set; } // 涓氬姟缁堟
- public string? FTerminateDate { get; set; } // 缁堟鏃ユ湡
- public string? FTerminatorId { get; set; } // 缁堟浜�
- public string? FSrcType { get; set; } // 婧愬崟绫诲瀷
- public string? FSrcBillNo { get; set; } // 婧愬崟鍗曞彿
- public string? FDeliQty { get; set; } // 绱鍙戣揣閫氱煡鏁伴噺
- public string? FStockOutQty { get; set; } // 绱鍑哄簱鏁伴噺
- public string? FBaseRetNoticeQty { get; set; } // 绱閫�璐ч�氱煡鏁伴噺锛堥攢鍞熀鏈級
- public string? FBaseReturnQty { get; set; } // 绱閫�璐ф暟閲忥紙閿�鍞熀鏈級
- public string? FBaseRemainOutQty { get; set; } // 鍓╀綑鏈嚭鏁伴噺锛堥攢鍞熀鏈級
- public string? FBASEARQTY { get; set; } // 绱搴旀敹鏁伴噺锛堥攢鍞熀鏈級
- public string? ErpID { get; set; } // ERPID
- public string? EHID { get; set; } // ERP澶碔D
+ public string? FMaterialId { get; set; } // 鐗╂枡缂栫爜
+ public string? FUnitID { get; set; } // 閿�鍞崟浣�
+ public string? FQty { get; set; } // 閿�鍞暟閲�
+ public string? FPriceUnitId { get; set; } // 璁′环鍗曚綅
+ public string? FPriceUnitQty { get; set; } // 璁′环鏁伴噺
+ public string? FDeliveryDate { get; set; } // 瑕佽揣鏃ユ湡
+ public string? FIsFree { get; set; } // 鏄惁璧犲搧
+ public string? FOwnerTypeId { get; set; } // 璐т富绫诲瀷
+ public string? FOwnerId { get; set; } // 璐т富
+ public string? FEntryNote { get; set; } // 澶囨敞
+ public string? FMtoNo { get; set; } // 璁″垝璺熻釜鍙�
+ public string? FLot { get; set; } // 鎵瑰彿
+ public string? FDeliveryMaxQty { get; set; } // 鍙戣揣涓婇檺
+ public string? FDeliveryMinQty { get; set; } // 鍙戣揣涓嬮檺
+ public string? FOutLmtUnitID { get; set; } // 瓒呭彂鎺у埗鍗曚綅
+ public string? FMrpCloseStatus { get; set; } // 涓氬姟鍏抽棴
+ public string? FMrpTerminateStatus { get; set; } // 涓氬姟缁堟
+ public string? FTerminateDate { get; set; } // 缁堟鏃ユ湡
+ public string? FTerminatorId { get; set; } // 缁堟浜�
+ public string? FSrcType { get; set; } // 婧愬崟绫诲瀷
+ public string? FSrcBillNo { get; set; } // 婧愬崟鍗曞彿
+ public string? FDeliQty { get; set; } // 绱鍙戣揣閫氱煡鏁伴噺
+ public string? FStockOutQty { get; set; } // 绱鍑哄簱鏁伴噺
+ public string? FBaseRetNoticeQty { get; set; } // 绱閫�璐ч�氱煡鏁伴噺锛堥攢鍞熀鏈級
+ public string? FBaseReturnQty { get; set; } // 绱閫�璐ф暟閲忥紙閿�鍞熀鏈級
+ public string? FBaseRemainOutQty { get; set; } // 鍓╀綑鏈嚭鏁伴噺锛堥攢鍞熀鏈級
+ public string? FBASEARQTY { get; set; } // 绱搴旀敹鏁伴噺锛堥攢鍞熀鏈級
+ public string? ErpID { get; set; } // ERPID
+ public string? EHID { get; set; } // ERP澶碔D
public string? FXSHTH { get; set; } //閿�鍞鍗曞彿
public string? F_ZJXF_TEXT_QTR_LEE { get; set; } //瀹㈡埛璁㈠崟鍙�
public string? FXSHTBH { get; set; } //閿�鍞悎鍚岀紪鍙�
diff --git a/MES.Service/Dto/webApi/ErpSalesReturn.cs b/MES.Service/Dto/webApi/ErpSalesReturn.cs
index 9a03469..0691ac6 100644
--- a/MES.Service/Dto/webApi/ErpSalesReturn.cs
+++ b/MES.Service/Dto/webApi/ErpSalesReturn.cs
@@ -1,6 +1,4 @@
-锘縰sing MES.Service.Modes;
-
-namespace MES.Service.Dto.webApi;
+锘縩amespace MES.Service.Dto.webApi;
public class ErpSalesRerurn
{
diff --git a/MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs b/MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs
index 2dfbe61..6b63f90 100644
--- a/MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs
+++ b/MES.Service/Dto/webApi/ErpSalesReturnDetailDto.cs
@@ -3,29 +3,28 @@
public class ErpSalesReturnDetailDto
{
public string? Type { get; set; }
- public string? FMaterialId { get; set; } // 鐗╂枡缂栫爜
- public string? FMaterialName { get; set; } // 鐗╂枡鍚嶇О
- public string? FMaterialModel { get; set; } // 瑙勬牸鍨嬪彿
- public string? FUnitID { get; set; } // 閿�鍞崟浣�
- public string? FQty { get; set; } // 閿�鍞暟閲�
- public string? FIsFree { get; set; } // 鏄惁璧犲搧
- public string? FDeliverydate { get; set; } // 閫�璐ф棩鏈�
- public string? FStockId { get; set; } // 浠撳簱
- public string? FMtoNo { get; set; } // 璁″垝璺熻釜鍙�
- public string? FLot { get; set; } // 鎵瑰彿
- public string? FEntryDescription { get; set; } // 澶囨敞
- public string? FRmType { get; set; } // 閫�璐х被鍨�
- public string? FStockUnitID { get; set; } // 搴撳瓨鍗曚綅
- public decimal? FStockQty { get; set; } // 搴撳瓨鏁伴噺
- public string? FMaterialType { get; set; } // 鐗╂枡绫诲埆
- public string? FOwnerTypeID { get; set; } // 璐т富绫诲瀷
- public string? FOwnerId { get; set; } // 璐т富
- public string? FSrcType { get; set; } // 婧愬崟绫诲瀷
- public string? FSrcBillNo { get; set; } // 婧愬崟缂栧彿
- public string? FOrderNo { get; set; } // 璁㈠崟鍗曞彿
- public string? ErpID { get; set; } // ERPID
- public string? EHID { get; set; } // ERP澶碔D
- public string? F_XSHTH { get; set; } // 閿�鍞鍗曞彿
- public string? F_ZJXF_Text_re5_lee { get; set; } // 瀹㈡埛璁㈠崟鍙�
-
+ public string? FMaterialId { get; set; } // 鐗╂枡缂栫爜
+ public string? FMaterialName { get; set; } // 鐗╂枡鍚嶇О
+ public string? FMaterialModel { get; set; } // 瑙勬牸鍨嬪彿
+ public string? FUnitID { get; set; } // 閿�鍞崟浣�
+ public string? FQty { get; set; } // 閿�鍞暟閲�
+ public string? FIsFree { get; set; } // 鏄惁璧犲搧
+ public string? FDeliverydate { get; set; } // 閫�璐ф棩鏈�
+ public string? FStockId { get; set; } // 浠撳簱
+ public string? FMtoNo { get; set; } // 璁″垝璺熻釜鍙�
+ public string? FLot { get; set; } // 鎵瑰彿
+ public string? FEntryDescription { get; set; } // 澶囨敞
+ public string? FRmType { get; set; } // 閫�璐х被鍨�
+ public string? FStockUnitID { get; set; } // 搴撳瓨鍗曚綅
+ public decimal? FStockQty { get; set; } // 搴撳瓨鏁伴噺
+ public string? FMaterialType { get; set; } // 鐗╂枡绫诲埆
+ public string? FOwnerTypeID { get; set; } // 璐т富绫诲瀷
+ public string? FOwnerId { get; set; } // 璐т富
+ public string? FSrcType { get; set; } // 婧愬崟绫诲瀷
+ public string? FSrcBillNo { get; set; } // 婧愬崟缂栧彿
+ public string? FOrderNo { get; set; } // 璁㈠崟鍗曞彿
+ public string? ErpID { get; set; } // ERPID
+ public string? EHID { get; set; } // ERP澶碔D
+ public string? F_XSHTH { get; set; } // 閿�鍞鍗曞彿
+ public string? F_ZJXF_Text_re5_lee { get; set; } // 瀹㈡埛璁㈠崟鍙�
}
\ No newline at end of file
diff --git a/MES.Service/MES.Service.csproj b/MES.Service/MES.Service.csproj
index 5e01337..f2b5b6a 100644
--- a/MES.Service/MES.Service.csproj
+++ b/MES.Service/MES.Service.csproj
@@ -11,4 +11,8 @@
<PackageReference Include="SqlSugarCore" Version="5.1.4.158"/>
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="DB\Scripts\"/>
+ </ItemGroup>
+
</Project>
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>
- /// 鍏徃浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// 鍏徃浠ｇ爜
+ /// </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/MesDeliveryNote.cs b/MES.Service/Modes/MesDeliveryNote.cs
index f0d7350..4460f1f 100644
--- a/MES.Service/Modes/MesDeliveryNote.cs
+++ b/MES.Service/Modes/MesDeliveryNote.cs
@@ -11,7 +11,8 @@
/// <summary>
/// SEQ_DELIVERY
/// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_DELIVERY")]
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,
+ OracleSequenceName = "SEQ_DELIVERY")]
public decimal Id { get; set; }
/// <summary>
diff --git a/MES.Service/Modes/MesDeliveryNoteBarcode.cs b/MES.Service/Modes/MesDeliveryNoteBarcode.cs
index 16b8478..aeb1e95 100644
--- a/MES.Service/Modes/MesDeliveryNoteBarcode.cs
+++ b/MES.Service/Modes/MesDeliveryNoteBarcode.cs
@@ -11,7 +11,8 @@
/// <summary>
/// SEQ_DELIVERY
/// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,OracleSequenceName = "SEQ_DELIVERY")]
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,
+ OracleSequenceName = "SEQ_DELIVERY")]
public decimal Id { get; set; }
/// <summary>
diff --git a/MES.Service/Modes/MesDeliveryNoteDetails.cs b/MES.Service/Modes/MesDeliveryNoteDetails.cs
index 707c793..4f3bfd4 100644
--- a/MES.Service/Modes/MesDeliveryNoteDetails.cs
+++ b/MES.Service/Modes/MesDeliveryNoteDetails.cs
@@ -11,7 +11,8 @@
/// <summary>
/// SEQ_DELIVERY
/// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_DELIVERY")]
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,
+ OracleSequenceName = "SEQ_DELIVERY")]
public decimal Id { get; set; }
/// <summary>
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>
- /// 鐜繚浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "ROHSE_CODE")]
+ /// <summary>
+ /// 鐜繚浠ｇ爜
+ /// </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 9ca8594..89ddce5 100644
--- a/MES.Service/Modes/MesInvBusiness2.cs
+++ b/MES.Service/Modes/MesInvBusiness2.cs
@@ -8,220 +8,220 @@
[SugarTable("MES_INV_BUSINESS2")]
public class MesInvBusiness2
{
- /// <summary>
- /// ID(seq_inv_id)
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ID",
+ /// <summary>
+ /// ID(seq_inv_id)
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_ID",
IsPrimaryKey = true)]
public decimal Id { get; set; }
- /// <summary>
- /// 鐘舵�亅0-鏈氦鏄�1-宸蹭氦鏄�
- /// </summary>
- [SugarColumn(ColumnName = "STATUS")]
+ /// <summary>
+ /// 鐘舵�亅0-鏈氦鏄�1-宸蹭氦鏄�
+ /// </summary>
+ [SugarColumn(ColumnName = "STATUS")]
public decimal? Status { get; set; }
- /// <summary>
- /// 鍗曟嵁绫诲瀷ID
- /// </summary>
- [SugarColumn(ColumnName = "BILL_TYPE_ID")]
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷ID
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_TYPE_ID")]
public decimal? BillTypeId { get; set; }
- /// <summary>
- /// 浜嬪姟绫诲瀷缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "TRANSACTION_CODE")]
+ /// <summary>
+ /// 浜嬪姟绫诲瀷缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "TRANSACTION_CODE")]
public string TransactionCode { 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>
- /// 鍗曟嵁ID
- /// </summary>
- [SugarColumn(ColumnName = "BILL_ID")]
+ /// <summary>
+ /// 鍗曟嵁ID
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_ID")]
public decimal? BillId { get; set; }
- /// <summary>
- /// 鍗曟嵁缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "BILL_NO")]
+ /// <summary>
+ /// 鍗曟嵁缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
public string BillNo { get; set; }
- /// <summary>
- /// 鐢熶骇璁㈠崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "TASK_NO")]
+ /// <summary>
+ /// 鐢熶骇璁㈠崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "TASK_NO")]
public string TaskNo { get; set; }
- /// <summary>
- /// 瀹㈡埛缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "CUSTOMER_NO")]
+ /// <summary>
+ /// 瀹㈡埛缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CUSTOMER_NO")]
public string CustomerNo { get; set; }
- /// <summary>
- /// 鍗曟嵁琛孖D
- /// </summary>
- [SugarColumn(ColumnName = "BILL_LINE_ID")]
+ /// <summary>
+ /// 鍗曟嵁琛孖D
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_LINE_ID")]
public decimal? BillLineId { get; set; }
- /// <summary>
- /// 鐗╂枡鏉＄爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_BARCODE")]
+ /// <summary>
+ /// 鐗╂枡鏉＄爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_BARCODE")]
public string ItemBarcode { get; set; }
- /// <summary>
- /// 鏈徃鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
+ /// <summary>
+ /// 鏈徃鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
public string ItemNo { get; set; }
- /// <summary>
- /// 瀹㈡埛鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "C_ITEM_CODE")]
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "C_ITEM_CODE")]
public string CItemCode { get; set; }
- /// <summary>
- /// 鍘傚鎵规
- /// </summary>
- [SugarColumn(ColumnName = "LOT_NO")]
+ /// <summary>
+ /// 鍘傚鎵规
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NO")]
public string LotNo { get; set; }
- /// <summary>
- /// 鏄惁鐜繚(0:鍚�,1:鏄�)
- /// </summary>
- [SugarColumn(ColumnName = "EP_FLAG")]
+ /// <summary>
+ /// 鏄惁鐜繚(0:鍚�,1:鏄�)
+ /// </summary>
+ [SugarColumn(ColumnName = "EP_FLAG")]
public short? EpFlag { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "QUANTITY")]
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "QUANTITY")]
public decimal? Quantity { get; set; }
- /// <summary>
- /// 婧愬瓙搴揅ODE
- /// </summary>
- [SugarColumn(ColumnName = "FROM_INV_DEPOTS_CODE")]
+ /// <summary>
+ /// 婧愬瓙搴揅ODE
+ /// </summary>
+ [SugarColumn(ColumnName = "FROM_INV_DEPOTS_CODE")]
public string FromInvDepotsCode { get; set; }
- /// <summary>
- /// 婧愯揣浣岰ODE
- /// </summary>
- [SugarColumn(ColumnName = "FROM_INV_DEPOT_SECTIONS_CODE")]
+ /// <summary>
+ /// 婧愯揣浣岰ODE
+ /// </summary>
+ [SugarColumn(ColumnName = "FROM_INV_DEPOT_SECTIONS_CODE")]
public string FromInvDepotSectionsCode { get; set; }
- /// <summary>
- /// 鐩殑瀛愬簱CODE
- /// </summary>
- [SugarColumn(ColumnName = "TO_INV_DEPOTS_CODE")]
+ /// <summary>
+ /// 鐩殑瀛愬簱CODE
+ /// </summary>
+ [SugarColumn(ColumnName = "TO_INV_DEPOTS_CODE")]
public string ToInvDepotsCode { get; set; }
- /// <summary>
- /// 鐩殑璐т綅CODE
- /// </summary>
- [SugarColumn(ColumnName = "TO_INV_DEPOT_SECTIONS_CODE")]
+ /// <summary>
+ /// 鐩殑璐т綅CODE
+ /// </summary>
+ [SugarColumn(ColumnName = "TO_INV_DEPOT_SECTIONS_CODE")]
public string ToInvDepotSectionsCode { get; set; }
- /// <summary>
- /// 浜ゆ槗寮傚父淇℃伅
- /// </summary>
- [SugarColumn(ColumnName = "DESCRIPTION")]
+ /// <summary>
+ /// 浜ゆ槗寮傚父淇℃伅
+ /// </summary>
+ [SugarColumn(ColumnName = "DESCRIPTION")]
public string Description { 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 = "ULLAGE_STAT_FLAG")]
+ /// <summary>
+ /// 瓒呮崯缁熻鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "ULLAGE_STAT_FLAG")]
public short? UllageStatFlag { 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 = "ITEM_BARCODE2")]
+ /// <summary>
+ /// 绠卞彿鏉＄爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_BARCODE2")]
public string ItemBarcode2 { get; set; }
- /// <summary>
- /// 鍗℃澘鏉＄爜
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_BARCODE3")]
+ /// <summary>
+ /// 鍗℃澘鏉＄爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_BARCODE3")]
public string ItemBarcode3 { get; set; }
- /// <summary>
- /// 浠诲姟鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "WORK_NO")]
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_NO")]
public string WorkNo { get; set; }
- /// <summary>
- /// 浠诲姟鍗曡鍙�
- /// </summary>
- [SugarColumn(ColumnName = "WORK_LINE")]
+ /// <summary>
+ /// 浠诲姟鍗曡鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_LINE")]
public decimal? WorkLine { get; set; }
- /// <summary>
- /// 渚涘簲鍟�
- /// </summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
public string SuppNo { get; set; }
- /// <summary>
- /// 鐢熶骇绾�
- /// </summary>
- [SugarColumn(ColumnName = "LINE_NO")]
+ /// <summary>
+ /// 鐢熶骇绾�
+ /// </summary>
+ [SugarColumn(ColumnName = "LINE_NO")]
public string LineNo { get; set; }
- /// <summary>
- /// 閲囪喘璁㈠崟id
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_K3ID")]
+ /// <summary>
+ /// 閲囪喘璁㈠崟id
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN_K3ID")]
public decimal? EbelnK3id { get; set; }
- /// <summary>
- /// 閲囪喘璁㈠崟琛宨d
- /// </summary>
- [SugarColumn(ColumnName = "LINE_K3ID")]
+ /// <summary>
+ /// 閲囪喘璁㈠崟琛宨d
+ /// </summary>
+ [SugarColumn(ColumnName = "LINE_K3ID")]
public decimal? LineK3id { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemArn.cs b/MES.Service/Modes/MesInvItemArn.cs
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>
- /// 鍏徃浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// 鍏徃浠ｇ爜
+ /// </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/MesInvItemInCDetails2.cs b/MES.Service/Modes/MesInvItemInCDetails2.cs
index 0f20068..ac6706b 100644
--- a/MES.Service/Modes/MesInvItemInCDetails2.cs
+++ b/MES.Service/Modes/MesInvItemInCDetails2.cs
@@ -1,304 +1,358 @@
-锘縰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_INV_ITEM_IN_C_DETAILS2")]
+public class MesInvItemInCDetails2
{
- /// <summary>
- /// 鐗╂枡鎴愬搧鍏ュ簱鐢宠鏉＄爜鏄庣粏
- ///</summary>
- [SugarTable("MES_INV_ITEM_IN_C_DETAILS2")]
- public class MesInvItemInCDetails2
- {
- /// <summary>
- /// SEQ_OUT
- ///</summary>
- [SugarColumn(ColumnName="ID" ,IsPrimaryKey = true )]
- public decimal Id { get; set; }
- /// <summary>
- /// 鍏ュ簱鍗昳d
- ///</summary>
- [SugarColumn(ColumnName="ITEM_IN_ID" ,IsPrimaryKey = true )]
- public decimal ItemInId { get; set; }
- /// <summary>
- /// 鐗╂枡鏉＄爜PSN
- ///</summary>
- [SugarColumn(ColumnName="ITEM_BARCODE" )]
- public string? ItemBarcode { get; set; }
- /// <summary>
- /// 瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
- ///</summary>
- [SugarColumn(ColumnName="C_ITEM_CODE" )]
- public string? CItemCode { get; set; }
- /// <summary>
- /// 瀹㈡埛鐗╂枡鏉＄爜
- ///</summary>
- [SugarColumn(ColumnName="C_ITEM_BARCODE" )]
- public string? CItemBarcode { get; set; }
- /// <summary>
- /// 楠屾敹鏁伴噺
- ///</summary>
- [SugarColumn(ColumnName="QUANTITY" )]
- public decimal? Quantity { get; set; }
- /// <summary>
- /// 鍏ュ簱鏂瑰紡(1:鏈夋潯鐮�,0:鏃犳潯鐮�)
- ///</summary>
- [SugarColumn(ColumnName="BARCODE_FLAG" )]
- public short? BarcodeFlag { get; set; }
- /// <summary>
- /// 鐜繚鏍囧織锛�0-闈炵幆淇�,1-鐜繚.鏃犳潯鐮佹墜宸ュ綍鍏ワ紝鏈夋潯鐮佷负鍐椾綑瀛楁锛�
- ///</summary>
- [SugarColumn(ColumnName="EP_FLAG" )]
- public short? EpFlag { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- ///</summary>
- [SugarColumn(ColumnName="CREATE_BY" )]
- public string? CreateBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- ///</summary>
- [SugarColumn(ColumnName="CREATE_DATE" )]
- public DateTime? CreateDate { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- ///</summary>
- [SugarColumn(ColumnName="LASTUPDATE_BY" )]
- public string? LastupdateBy { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- ///</summary>
- [SugarColumn(ColumnName="LASTUPDATE_DATE" )]
- public DateTime? LastupdateDate { get; set; }
- /// <summary>
- /// 浣滀笟鏂瑰紡0-鏈夌嚎鏉＄爜鏋�1-鏃犵嚎鏉＄爜鏋�
- ///</summary>
- [SugarColumn(ColumnName="WORK_TYPE" )]
- public decimal? WorkType { get; set; }
- /// <summary>
- /// 鏈徃鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
- ///</summary>
- [SugarColumn(ColumnName="ITEM_NO" )]
- public string? ItemNo { get; set; }
- /// <summary>
- /// 鍘傚鎵规
- ///</summary>
- [SugarColumn(ColumnName="LOT_NO" )]
- public string? LotNo { get; set; }
- /// <summary>
- /// 鏄惁鍏辩鐗╂枡(0:鍚︼紝1:鏄�)
- ///</summary>
- [SugarColumn(ColumnName="COMANAGEMENT_FLAG" )]
- public short? ComanagementFlag { get; set; }
- /// <summary>
- /// 瀹㈡埛缂栫爜
- ///</summary>
- [SugarColumn(ColumnName="CUST_NO" )]
- public string? CustNo { get; set; }
- /// <summary>
- /// 妫�楠岀粨鏋�
- ///</summary>
- [SugarColumn(ColumnName="CHECK_RES" )]
- public string? CheckRes { get; set; }
- /// <summary>
- /// 杩涜揣鏁伴噺
- ///</summary>
- [SugarColumn(ColumnName="CHECK_QTY" )]
- public decimal? CheckQty { get; set; }
- /// <summary>
- /// 妫�楠岀姸鎬�
- ///</summary>
- [SugarColumn(ColumnName="CHECK_STATES" )]
- public string? CheckStates { get; set; }
- /// <summary>
- /// 寮哄埗鍏ュ簱鏍囪0鏃狅紝1-寮哄埗鍏ュ簱 閫�鏂欏崟浣跨敤
- ///</summary>
- [SugarColumn(ColumnName="FORCE_IN_FLAG" )]
- public short? ForceInFlag { get; set; }
- /// <summary>
- /// 浠撳簱缂栫爜
- ///</summary>
- [SugarColumn(ColumnName="DEPOT_CODE" )]
- public string? DepotCode { get; set; }
- /// <summary>
- /// 璐т綅缂栫爜
- ///</summary>
- [SugarColumn(ColumnName="DEPOT_SECTION_CODE" )]
- public string? DepotSectionCode { get; set; }
- /// <summary>
- /// 鐗硅浜嬮」
- ///</summary>
- [SugarColumn(ColumnName="REMARK" )]
- public string? Remark { get; set; }
- /// <summary>
- /// 鐗╂枡鏉＄爜
- ///</summary>
- [SugarColumn(ColumnName="ITEM_BARCODE2" )]
- public string? ItemBarcode2 { get; set; }
- /// <summary>
- /// 鏂版潯鐮�
- ///</summary>
- [SugarColumn(ColumnName="ITEM_BARCODE3" )]
- public string? ItemBarcode3 { get; set; }
- /// <summary>
- /// 浣跨敤鏁伴噺
- ///</summary>
- [SugarColumn(ColumnName="USE_QTY" )]
- public decimal? UseQty { get; set; }
- /// <summary>
- /// 棰嗘枡鏁伴噺
- ///</summary>
- [SugarColumn(ColumnName="OUT_QTY" )]
- public decimal? OutQty { get; set; }
- /// <summary>
- /// 鐗╂枡绠�绉�
- ///</summary>
- [SugarColumn(ColumnName="ITEM_SNAME" )]
- public string? ItemSname { get; set; }
- /// <summary>
- /// 妗ｄ綅浣庡��
- ///</summary>
- [SugarColumn(ColumnName="SPOSTION" )]
- public decimal? Spostion { get; set; }
- /// <summary>
- /// 妗ｄ綅楂樺��
- ///</summary>
- [SugarColumn(ColumnName="EPOSTION" )]
- public decimal? Epostion { get; set; }
- /// <summary>
- /// 妫�楠屾棩鏈�
- ///</summary>
- [SugarColumn(ColumnName="CHECK_DATE" )]
- public DateTime? CheckDate { get; set; }
- /// <summary>
- /// 鍗曚綅
- ///</summary>
- [SugarColumn(ColumnName="UNIT" )]
- public string? Unit { get; set; }
- /// <summary>
- /// 鏄惁妫�楠�
- ///</summary>
- [SugarColumn(ColumnName="ISCHECK" )]
- public decimal? Ischeck { get; set; }
- /// <summary>
- /// 閲囪喘璁㈠崟
- ///</summary>
- [SugarColumn(ColumnName="EBELN" )]
- public string? Ebeln { get; set; }
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- ///</summary>
- [SugarColumn(ColumnName="LOT_DATE" )]
- public string? LotDate { get; set; }
- /// <summary>
- /// 鍏ュ簱鍗曞彿
- ///</summary>
- [SugarColumn(ColumnName="BILL_NO" )]
- public string? BillNo { get; set; }
- /// <summary>
- /// 鍏ュ簱瀹℃牳鏍囧織
- ///</summary>
- [SugarColumn(ColumnName="STOCK_OK" )]
- public short? StockOk { get; set; }
- /// <summary>
- /// 鍒嗗巶缂栫爜
- ///</summary>
- [SugarColumn(ColumnName="FACTORY" )]
- public string? Factory { get; set; }
- /// <summary>
- /// 鍏徃浠ｇ爜
- ///</summary>
- [SugarColumn(ColumnName="COMPANY" )]
- public string? Company { get; set; }
- /// <summary>
- /// 鍗℃澘缂栫爜
- ///</summary>
- [SugarColumn(ColumnName="CB_NO" )]
- public string? CbNo { get; set; }
- /// <summary>
- /// 绠卞彿
- ///</summary>
- [SugarColumn(ColumnName="BOX_NO" )]
- public string? BoxNo { get; set; }
- /// <summary>
- /// 浠撳簱ID
- ///</summary>
- [SugarColumn(ColumnName="DEPOT_ID" )]
- public decimal? DepotId { get; set; }
- /// <summary>
- /// 璐т綅ID
- ///</summary>
- [SugarColumn(ColumnName="DEPOT_SECTION_ID" )]
- public decimal? DepotSectionId { get; set; }
- /// <summary>
- /// 琛屽彿
- ///</summary>
- [SugarColumn(ColumnName="LINE_NUM" )]
- public string? LineNum { get; set; }
- /// <summary>
- /// 鎵爜鏁伴噺
- ///</summary>
- [SugarColumn(ColumnName="SM_QTY" )]
- public decimal? SmQty { get; set; }
- /// <summary>
- /// 閿�鍞鍗�
- ///</summary>
- [SugarColumn(ColumnName="VGBEL" )]
- public string? Vgbel { get; set; }
- /// <summary>
- /// 閿�鍞鍗曡鍙�
- ///</summary>
- [SugarColumn(ColumnName="KDPOS" )]
- public decimal? Kdpos { get; set; }
- /// <summary>
- /// 浠诲姟鍗曞彿
- ///</summary>
- [SugarColumn(ColumnName="WORK_NO" )]
- public string? WorkNo { get; set; }
- /// <summary>
- /// 琛屽彿
- ///</summary>
- [SugarColumn(ColumnName="EBELN_LINE_NO" )]
- public decimal? EbelnLineNo { get; set; }
- /// <summary>
- /// 鍒拌揣鍗曞彿
- ///</summary>
- [SugarColumn(ColumnName="CBILL_NO" )]
- public string? CbillNo { get; set; }
- /// <summary>
- /// 鎬ユ枡鏍囪瘑
- ///</summary>
- [SugarColumn(ColumnName="URGENT_FLAG" )]
- public decimal? UrgentFlag { get; set; }
- /// <summary>
- /// 浜у搧鍨嬪彿
- ///</summary>
- [SugarColumn(ColumnName="BOARD_STYLE" )]
- public string? BoardStyle { get; set; }
- /// <summary>
- /// 浠诲姟鍗曡鍙�
- ///</summary>
- [SugarColumn(ColumnName="WORK_LINE" )]
- public decimal? WorkLine { get; set; }
- /// <summary>
- /// 鐢熶骇宸ュ崟
- ///</summary>
- [SugarColumn(ColumnName="TASK_NO" )]
- public string? TaskNo { get; set; }
- /// <summary>
- /// 渚涘簲鍟�
- ///</summary>
- [SugarColumn(ColumnName="SUPP_NO" )]
- public string? SuppNo { get; set; }
- /// <summary>
- /// 浠诲姟姹囨姤鍗�
- ///</summary>
- [SugarColumn(ColumnName="RBILL_NO" )]
- public string? RbillNo { get; set; }
- /// <summary>
- /// 鐗╂枡ID
- ///</summary>
- [SugarColumn(ColumnName="ITEM_ID" )]
- public decimal? ItemId { get; set; }
- }
-}
+ /// <summary>
+ /// SEQ_OUT
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ public decimal Id { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱鍗昳d
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_IN_ID", IsPrimaryKey = true)]
+ public decimal ItemInId { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鏉＄爜PSN
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_BARCODE")]
+ public string? ItemBarcode { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
+ /// </summary>
+ [SugarColumn(ColumnName = "C_ITEM_CODE")]
+ public string? CItemCode { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡鏉＄爜
+ /// </summary>
+ [SugarColumn(ColumnName = "C_ITEM_BARCODE")]
+ public string? CItemBarcode { get; set; }
+
+ /// <summary>
+ /// 楠屾敹鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "QUANTITY")]
+ public decimal? Quantity { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱鏂瑰紡(1:鏈夋潯鐮�,0:鏃犳潯鐮�)
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_FLAG")]
+ public short? BarcodeFlag { get; set; }
+
+ /// <summary>
+ /// 鐜繚鏍囧織锛�0-闈炵幆淇�,1-鐜繚.鏃犳潯鐮佹墜宸ュ綍鍏ワ紝鏈夋潯鐮佷负鍐椾綑瀛楁锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "EP_FLAG")]
+ public short? EpFlag { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
+ public string? CreateBy { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public DateTime? CreateDate { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ public string? LastupdateBy { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ public DateTime? LastupdateDate { get; set; }
+
+ /// <summary>
+ /// 浣滀笟鏂瑰紡0-鏈夌嚎鏉＄爜鏋�1-鏃犵嚎鏉＄爜鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_TYPE")]
+ public decimal? WorkType { get; set; }
+
+ /// <summary>
+ /// 鏈徃鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
+ public string? ItemNo { get; set; }
+
+ /// <summary>
+ /// 鍘傚鎵规
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NO")]
+ public string? LotNo { get; set; }
+
+ /// <summary>
+ /// 鏄惁鍏辩鐗╂枡(0:鍚︼紝1:鏄�)
+ /// </summary>
+ [SugarColumn(ColumnName = "COMANAGEMENT_FLAG")]
+ public short? ComanagementFlag { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "CUST_NO")]
+ public string? CustNo { get; set; }
+
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_RES")]
+ public string? CheckRes { get; set; }
+
+ /// <summary>
+ /// 杩涜揣鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_QTY")]
+ public decimal? CheckQty { get; set; }
+
+ /// <summary>
+ /// 妫�楠岀姸鎬�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_STATES")]
+ public string? CheckStates { get; set; }
+
+ /// <summary>
+ /// 寮哄埗鍏ュ簱鏍囪0鏃狅紝1-寮哄埗鍏ュ簱 閫�鏂欏崟浣跨敤
+ /// </summary>
+ [SugarColumn(ColumnName = "FORCE_IN_FLAG")]
+ public short? ForceInFlag { get; set; }
+
+ /// <summary>
+ /// 浠撳簱缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_CODE")]
+ public string? DepotCode { get; set; }
+
+ /// <summary>
+ /// 璐т綅缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
+ public string? DepotSectionCode { get; set; }
+
+ /// <summary>
+ /// 鐗硅浜嬮」
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK")]
+ public string? Remark { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鏉＄爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_BARCODE2")]
+ public string? ItemBarcode2 { get; set; }
+
+ /// <summary>
+ /// 鏂版潯鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_BARCODE3")]
+ public string? ItemBarcode3 { get; set; }
+
+ /// <summary>
+ /// 浣跨敤鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "USE_QTY")]
+ public decimal? UseQty { get; set; }
+
+ /// <summary>
+ /// 棰嗘枡鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "OUT_QTY")]
+ public decimal? OutQty { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绠�绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_SNAME")]
+ public string? ItemSname { get; set; }
+
+ /// <summary>
+ /// 妗ｄ綅浣庡��
+ /// </summary>
+ [SugarColumn(ColumnName = "SPOSTION")]
+ public decimal? Spostion { get; set; }
+
+ /// <summary>
+ /// 妗ｄ綅楂樺��
+ /// </summary>
+ [SugarColumn(ColumnName = "EPOSTION")]
+ public decimal? Epostion { get; set; }
+
+ /// <summary>
+ /// 妫�楠屾棩鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_DATE")]
+ public DateTime? CheckDate { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "UNIT")]
+ public string? Unit { get; set; }
+
+ /// <summary>
+ /// 鏄惁妫�楠�
+ /// </summary>
+ [SugarColumn(ColumnName = "ISCHECK")]
+ public decimal? Ischeck { get; set; }
+
+ /// <summary>
+ /// 閲囪喘璁㈠崟
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN")]
+ public string? Ebeln { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_DATE")]
+ public string? LotDate { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
+ public string? BillNo { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱瀹℃牳鏍囧織
+ /// </summary>
+ [SugarColumn(ColumnName = "STOCK_OK")]
+ public short? StockOk { get; set; }
+
+ /// <summary>
+ /// 鍒嗗巶缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
+ public string? Factory { get; set; }
+
+ /// <summary>
+ /// 鍏徃浠ｇ爜
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
+ public string? Company { get; set; }
+
+ /// <summary>
+ /// 鍗℃澘缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "CB_NO")]
+ public string? CbNo { get; set; }
+
+ /// <summary>
+ /// 绠卞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BOX_NO")]
+ public string? BoxNo { get; set; }
+
+ /// <summary>
+ /// 浠撳簱ID
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_ID")]
+ public decimal? DepotId { get; set; }
+
+ /// <summary>
+ /// 璐т綅ID
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_SECTION_ID")]
+ public decimal? DepotSectionId { get; set; }
+
+ /// <summary>
+ /// 琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "LINE_NUM")]
+ public string? LineNum { get; set; }
+
+ /// <summary>
+ /// 鎵爜鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "SM_QTY")]
+ public decimal? SmQty { get; set; }
+
+ /// <summary>
+ /// 閿�鍞鍗�
+ /// </summary>
+ [SugarColumn(ColumnName = "VGBEL")]
+ public string? Vgbel { get; set; }
+
+ /// <summary>
+ /// 閿�鍞鍗曡鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "KDPOS")]
+ public decimal? Kdpos { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_NO")]
+ public string? WorkNo { get; set; }
+
+ /// <summary>
+ /// 琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN_LINE_NO")]
+ public decimal? EbelnLineNo { get; set; }
+
+ /// <summary>
+ /// 鍒拌揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CBILL_NO")]
+ public string? CbillNo { get; set; }
+
+ /// <summary>
+ /// 鎬ユ枡鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "URGENT_FLAG")]
+ public decimal? UrgentFlag { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍨嬪彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BOARD_STYLE")]
+ public string? BoardStyle { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍗曡鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_LINE")]
+ public decimal? WorkLine { get; set; }
+
+ /// <summary>
+ /// 鐢熶骇宸ュ崟
+ /// </summary>
+ [SugarColumn(ColumnName = "TASK_NO")]
+ public string? TaskNo { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
+ public string? SuppNo { get; set; }
+
+ /// <summary>
+ /// 浠诲姟姹囨姤鍗�
+ /// </summary>
+ [SugarColumn(ColumnName = "RBILL_NO")]
+ public string? RbillNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public decimal? ItemId { get; set; }
+}
\ No newline at end of file
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>
- /// 鍏徃浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// 鍏徃浠ｇ爜
+ /// </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>
- /// 鍏徃浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// 鍏徃浠ｇ爜
+ /// </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/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>
- /// 鍏徃浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// 鍏徃浠ｇ爜
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
public string Company { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesItems.cs b/MES.Service/Modes/MesItems.cs
index 5f60d31..d17eae5 100644
--- a/MES.Service/Modes/MesItems.cs
+++ b/MES.Service/Modes/MesItems.cs
@@ -156,7 +156,7 @@
/// ERP鏂欏彿
/// </summary>
[SugarColumn(ColumnName = "ERP_ITEM_NO")]
- public string? ErpItemNo { get; set; }
+ public string? ErpItemNo { get; set; }
/// <summary>
/// 榛樿浠撳簱
diff --git a/MES.Service/Modes/MesPcbComponentData.cs b/MES.Service/Modes/MesPcbComponentData.cs
index 1da9b3b..05d4d4d 100644
--- a/MES.Service/Modes/MesPcbComponentData.cs
+++ b/MES.Service/Modes/MesPcbComponentData.cs
@@ -1,96 +1,95 @@
using SqlSugar;
-using System;
-namespace MES.Service.Modes
+namespace MES.Service.Modes;
+
+/// <summary>
+/// PCB鍣ㄤ欢妫�娴嬫暟鎹〃
+/// </summary>
+[SugarTable("MES_PCB_COMPONENT_DATA")]
+public class MesPcbComponentData
{
/// <summary>
- /// PCB鍣ㄤ欢妫�娴嬫暟鎹〃
+ /// 涓婚敭ID
/// </summary>
- [SugarTable("MES_PCB_COMPONENT_DATA")]
- public class MesPcbComponentData
- {
- /// <summary>
- /// 涓婚敭ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_PCB_COMPONENT_DATA", IsPrimaryKey = true)]
- public decimal Id { get; set; }
+ [SugarColumn(ColumnName = "ID",
+ OracleSequenceName = "SEQ_PCB_COMPONENT_DATA", IsPrimaryKey = true)]
+ public decimal Id { get; set; }
- /// <summary>
- /// 妫�娴嬫暟鎹富琛↖D
- /// </summary>
- [SugarColumn(ColumnName = "TEST_DATA_ID")]
- public decimal TestDataId { get; set; }
+ /// <summary>
+ /// 妫�娴嬫暟鎹富琛↖D
+ /// </summary>
+ [SugarColumn(ColumnName = "TEST_DATA_ID")]
+ public decimal TestDataId { get; set; }
- /// <summary>
- /// 鍣ㄤ欢浣嶅彿
- /// </summary>
- [SugarColumn(ColumnName = "COMP_DESIGNATOR")]
- public string? CompDesignator { get; set; }
+ /// <summary>
+ /// 鍣ㄤ欢浣嶅彿
+ /// </summary>
+ [SugarColumn(ColumnName = "COMP_DESIGNATOR")]
+ public string? CompDesignator { get; set; }
- /// <summary>
- /// 鍣ㄤ欢鏂欏彿
- /// </summary>
- [SugarColumn(ColumnName = "COMP_PART")]
- public string? CompPart { get; set; }
+ /// <summary>
+ /// 鍣ㄤ欢鏂欏彿
+ /// </summary>
+ [SugarColumn(ColumnName = "COMP_PART")]
+ public string? CompPart { get; set; }
- /// <summary>
- /// 鍣ㄤ欢灏佽
- /// </summary>
- [SugarColumn(ColumnName = "COMP_PACKAGE")]
- public string? CompPackage { get; set; }
+ /// <summary>
+ /// 鍣ㄤ欢灏佽
+ /// </summary>
+ [SugarColumn(ColumnName = "COMP_PACKAGE")]
+ public string? CompPackage { get; set; }
- /// <summary>
- /// 鍣ㄤ欢绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "COMP_TYPE")]
- public string? CompType { get; set; }
+ /// <summary>
+ /// 鍣ㄤ欢绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "COMP_TYPE")]
+ public string? CompType { get; set; }
- /// <summary>
- /// 鍣ㄤ欢妫�娴嬩笉鑹唬鐮�
- /// </summary>
- [SugarColumn(ColumnName = "COMP_ROBOT_CODE")]
- public string? CompRobotCode { get; set; }
+ /// <summary>
+ /// 鍣ㄤ欢妫�娴嬩笉鑹唬鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "COMP_ROBOT_CODE")]
+ public string? CompRobotCode { get; set; }
- /// <summary>
- /// 鍣ㄤ欢妫�娴嬬粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "COMP_ROBOT_RESULT")]
- public string? CompRobotResult { get; set; }
+ /// <summary>
+ /// 鍣ㄤ欢妫�娴嬬粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "COMP_ROBOT_RESULT")]
+ public string? CompRobotResult { get; set; }
- /// <summary>
- /// 鍣ㄤ欢澶嶅垽涓嶈壇浠ｇ爜
- /// </summary>
- [SugarColumn(ColumnName = "COMP_USER_CODE")]
- public string? CompUserCode { get; set; }
+ /// <summary>
+ /// 鍣ㄤ欢澶嶅垽涓嶈壇浠ｇ爜
+ /// </summary>
+ [SugarColumn(ColumnName = "COMP_USER_CODE")]
+ public string? CompUserCode { get; set; }
- /// <summary>
- /// 鍣ㄤ欢澶嶅垽缁撴灉
- /// </summary>
- [SugarColumn(ColumnName = "COMP_USER_RESULT")]
- public string? CompUserResult { get; set; }
+ /// <summary>
+ /// 鍣ㄤ欢澶嶅垽缁撴灉
+ /// </summary>
+ [SugarColumn(ColumnName = "COMP_USER_RESULT")]
+ public string? CompUserResult { get; set; }
- /// <summary>
- /// 鍣ㄤ欢鍥剧墖鍦板潃
- /// </summary>
- [SugarColumn(ColumnName = "COMP_IMAGE")]
- public string? CompImage { get; set; }
+ /// <summary>
+ /// 鍣ㄤ欢鍥剧墖鍦板潃
+ /// </summary>
+ [SugarColumn(ColumnName = "COMP_IMAGE")]
+ public string? CompImage { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_TIME")]
- public DateTime? CreateTime { get; set; }
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_TIME")]
+ public DateTime? CreateTime { get; set; }
- /// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "UPDATE_TIME")]
- public DateTime? UpdateTime { get; set; }
+ /// <summary>
+ /// 鏇存柊鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "UPDATE_TIME")]
+ public DateTime? UpdateTime { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARKS")]
- public string? Remarks { get; set; }
- }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARKS")]
+ public string? Remarks { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesPcbTestData.cs b/MES.Service/Modes/MesPcbTestData.cs
index 1e7073d..17d8ca8 100644
--- a/MES.Service/Modes/MesPcbTestData.cs
+++ b/MES.Service/Modes/MesPcbTestData.cs
@@ -1,210 +1,209 @@
using SqlSugar;
-using System;
-namespace MES.Service.Modes
+namespace MES.Service.Modes;
+
+/// <summary>
+/// PCB妫�娴嬫暟鎹〃锛堟暣鏉�/鍗曟澘缁熶竴瀛樺偍锛�
+/// </summary>
+[SugarTable("MES_PCB_TEST_DATA")]
+public class MesPcbTestData
{
/// <summary>
- /// PCB妫�娴嬫暟鎹〃锛堟暣鏉�/鍗曟澘缁熶竴瀛樺偍锛�
+ /// 涓婚敭ID
/// </summary>
- [SugarTable("MES_PCB_TEST_DATA")]
- public class MesPcbTestData
- {
- /// <summary>
- /// 涓婚敭ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_PCB_TEST_DATA", IsPrimaryKey = true)]
- public decimal Id { get; set; }
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_PCB_TEST_DATA",
+ IsPrimaryKey = true)]
+ public decimal Id { get; set; }
- /// <summary>
- /// 鏁版嵁绫诲瀷锛歐HOLE-鏁存澘锛孲INGLE-鍗曟澘
- /// </summary>
- [SugarColumn(ColumnName = "DATA_TYPE")]
- public string DataType { get; set; }
+ /// <summary>
+ /// 鏁版嵁绫诲瀷锛歐HOLE-鏁存澘锛孲INGLE-鍗曟澘
+ /// </summary>
+ [SugarColumn(ColumnName = "DATA_TYPE")]
+ public string DataType { get; set; }
- /// <summary>
- /// 璁惧鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "DEVICE_NAME")]
- public string? DeviceName { get; set; }
+ /// <summary>
+ /// 璁惧鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "DEVICE_NAME")]
+ public string? DeviceName { get; set; }
- /// <summary>
- /// 鏁存澘鏉＄爜
- /// </summary>
- [SugarColumn(ColumnName = "PCB_SN")]
- public string? PcbSn { get; set; }
+ /// <summary>
+ /// 鏁存澘鏉＄爜
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_SN")]
+ public string? PcbSn { get; set; }
- /// <summary>
- /// 杞ㄩ亾淇℃伅锛�1-1杞紝2-2杞級
- /// </summary>
- [SugarColumn(ColumnName = "PCB_TRACK_LINE")]
- public int? PcbTrackLine { get; set; }
+ /// <summary>
+ /// 杞ㄩ亾淇℃伅锛�1-1杞紝2-2杞級
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_TRACK_LINE")]
+ public int? PcbTrackLine { get; set; }
- /// <summary>
- /// 鏉块潰锛圱-椤堕潰锛孊-搴曢潰锛孴+B-椤堕潰+搴曢潰锛�
- /// </summary>
- [SugarColumn(ColumnName = "PCB_BOARD_SIDE")]
- public string? PcbBoardSide { get; set; }
+ /// <summary>
+ /// 鏉块潰锛圱-椤堕潰锛孊-搴曢潰锛孴+B-椤堕潰+搴曢潰锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_BOARD_SIDE")]
+ public string? PcbBoardSide { get; set; }
- /// <summary>
- /// 妫�娴嬫椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "PCB_TEST_TIME")]
- public DateTime? PcbTestTime { get; set; }
+ /// <summary>
+ /// 妫�娴嬫椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_TEST_TIME")]
+ public DateTime? PcbTestTime { get; set; }
- /// <summary>
- /// 妫�娴嬭�楁椂锛堢锛�
- /// </summary>
- [SugarColumn(ColumnName = "PCB_CYCLE_TIME")]
- public decimal? PcbCycleTime { get; set; }
+ /// <summary>
+ /// 妫�娴嬭�楁椂锛堢锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_CYCLE_TIME")]
+ public decimal? PcbCycleTime { get; set; }
- /// <summary>
- /// 绋嬪簭鍚�/鏉垮紡鍚�
- /// </summary>
- [SugarColumn(ColumnName = "PCB_PROJECT_NAME")]
- public string? PcbProjectName { get; set; }
+ /// <summary>
+ /// 绋嬪簭鍚�/鏉垮紡鍚�
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_PROJECT_NAME")]
+ public string? PcbProjectName { get; set; }
- /// <summary>
- /// 鏁存澘妫�娴嬬粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "PCB_ROBOT_RESULT")]
- public string? PcbRobotResult { get; set; }
+ /// <summary>
+ /// 鏁存澘妫�娴嬬粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_ROBOT_RESULT")]
+ public string? PcbRobotResult { get; set; }
- /// <summary>
- /// 鏁存澘澶嶅垽缁撴灉
- /// </summary>
- [SugarColumn(ColumnName = "PCB_USER_RESULT")]
- public string? PcbUserResult { get; set; }
+ /// <summary>
+ /// 鏁存澘澶嶅垽缁撴灉
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_USER_RESULT")]
+ public string? PcbUserResult { get; set; }
- /// <summary>
- /// 鏁存澘鏈�缁堢粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "PCB_FINAL_RESULT")]
- public string? PcbFinalResult { get; set; }
+ /// <summary>
+ /// 鏁存澘鏈�缁堢粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_FINAL_RESULT")]
+ public string? PcbFinalResult { get; set; }
- /// <summary>
- /// 缁翠慨绔欏鍒ょ敤鎴峰悕
- /// </summary>
- [SugarColumn(ColumnName = "PCB_REPAIR_USER")]
- public string? PcbRepairUser { get; set; }
+ /// <summary>
+ /// 缁翠慨绔欏鍒ょ敤鎴峰悕
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_REPAIR_USER")]
+ public string? PcbRepairUser { get; set; }
- /// <summary>
- /// 鎷兼澘鏁伴噺锛堟暣鏉挎暟鎹娇鐢級
- /// </summary>
- [SugarColumn(ColumnName = "PCB_BOARD_NUMBER")]
- public int? PcbBoardNumber { get; set; }
+ /// <summary>
+ /// 鎷兼澘鏁伴噺锛堟暣鏉挎暟鎹娇鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_BOARD_NUMBER")]
+ public int? PcbBoardNumber { get; set; }
- /// <summary>
- /// 鎷兼澘妫�娴婲G鏁伴噺锛堟暣鏉挎暟鎹娇鐢級
- /// </summary>
- [SugarColumn(ColumnName = "PCB_BOARD_ROBOT_NG_NUMBER")]
- public int? PcbBoardRobotNgNumber { get; set; }
+ /// <summary>
+ /// 鎷兼澘妫�娴婲G鏁伴噺锛堟暣鏉挎暟鎹娇鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_BOARD_ROBOT_NG_NUMBER")]
+ public int? PcbBoardRobotNgNumber { get; set; }
- /// <summary>
- /// 鎷兼澘澶嶅垽NG鏁伴噺锛堟暣鏉挎暟鎹娇鐢級
- /// </summary>
- [SugarColumn(ColumnName = "PCB_BOARD_USER_NG_NUMBER")]
- public int? PcbBoardUserNgNumber { get; set; }
+ /// <summary>
+ /// 鎷兼澘澶嶅垽NG鏁伴噺锛堟暣鏉挎暟鎹娇鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_BOARD_USER_NG_NUMBER")]
+ public int? PcbBoardUserNgNumber { get; set; }
- /// <summary>
- /// 鎷兼澘璇姤鏁伴噺锛堟暣鏉挎暟鎹娇鐢級
- /// </summary>
- [SugarColumn(ColumnName = "PCB_BOARD_REPASS_NUMBER")]
- public int? PcbBoardRepassNumber { get; set; }
+ /// <summary>
+ /// 鎷兼澘璇姤鏁伴噺锛堟暣鏉挎暟鎹娇鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_BOARD_REPASS_NUMBER")]
+ public int? PcbBoardRepassNumber { get; set; }
- /// <summary>
- /// 鍣ㄤ欢鎬绘暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "PCB_COMP_NUMBER")]
- public int? PcbCompNumber { get; set; }
+ /// <summary>
+ /// 鍣ㄤ欢鎬绘暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_COMP_NUMBER")]
+ public int? PcbCompNumber { get; set; }
- /// <summary>
- /// 鍣ㄤ欢妫�娴婲G鏁伴噺锛堟暣鏉挎暟鎹娇鐢級
- /// </summary>
- [SugarColumn(ColumnName = "PCB_COMP_ROBOT_NG_NUMBER")]
- public int? PcbCompRobotNgNumber { get; set; }
+ /// <summary>
+ /// 鍣ㄤ欢妫�娴婲G鏁伴噺锛堟暣鏉挎暟鎹娇鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_COMP_ROBOT_NG_NUMBER")]
+ public int? PcbCompRobotNgNumber { get; set; }
- /// <summary>
- /// 鍣ㄤ欢澶嶅垽NG鏁伴噺锛堟暣鏉挎暟鎹娇鐢級
- /// </summary>
- [SugarColumn(ColumnName = "PCB_COMP_USER_NG_NUMBER")]
- public int? PcbCompUserNgNumber { get; set; }
+ /// <summary>
+ /// 鍣ㄤ欢澶嶅垽NG鏁伴噺锛堟暣鏉挎暟鎹娇鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_COMP_USER_NG_NUMBER")]
+ public int? PcbCompUserNgNumber { get; set; }
- /// <summary>
- /// 鍣ㄤ欢璇姤鏁伴噺锛堟暣鏉挎暟鎹娇鐢級
- /// </summary>
- [SugarColumn(ColumnName = "PCB_COMP_REPASS_NUMBER")]
- public int? PcbCompRepassNumber { get; set; }
+ /// <summary>
+ /// 鍣ㄤ欢璇姤鏁伴噺锛堟暣鏉挎暟鎹娇鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "PCB_COMP_REPASS_NUMBER")]
+ public int? PcbCompRepassNumber { get; set; }
- /// <summary>
- /// 鎷兼澘鏉＄爜锛堝崟鏉挎暟鎹娇鐢級
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_SN")]
- public string? BoardSn { get; set; }
+ /// <summary>
+ /// 鎷兼澘鏉＄爜锛堝崟鏉挎暟鎹娇鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "BOARD_SN")]
+ public string? BoardSn { get; set; }
- /// <summary>
- /// 鎷兼澘搴忓彿锛堝崟鏉挎暟鎹娇鐢級
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_NO")]
- public string? BoardNo { get; set; }
+ /// <summary>
+ /// 鎷兼澘搴忓彿锛堝崟鏉挎暟鎹娇鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "BOARD_NO")]
+ public string? BoardNo { get; set; }
- /// <summary>
- /// 鎷兼澘妫�娴嬬粨鏋滐紙鍗曟澘鏁版嵁浣跨敤锛�
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_ROBOT_RESULT")]
- public string? BoardRobotResult { get; set; }
+ /// <summary>
+ /// 鎷兼澘妫�娴嬬粨鏋滐紙鍗曟澘鏁版嵁浣跨敤锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "BOARD_ROBOT_RESULT")]
+ public string? BoardRobotResult { get; set; }
- /// <summary>
- /// 鎷兼澘澶嶅垽缁撴灉锛堝崟鏉挎暟鎹娇鐢級
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_USER_RESULT")]
- public string? BoardUserResult { get; set; }
+ /// <summary>
+ /// 鎷兼澘澶嶅垽缁撴灉锛堝崟鏉挎暟鎹娇鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "BOARD_USER_RESULT")]
+ public string? BoardUserResult { get; set; }
- /// <summary>
- /// 鎷兼澘鏈�缁堢粨鏋滐紙鍗曟澘鏁版嵁浣跨敤锛�
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_FINAL_RESULT")]
- public string? BoardFinalResult { get; set; }
+ /// <summary>
+ /// 鎷兼澘鏈�缁堢粨鏋滐紙鍗曟澘鏁版嵁浣跨敤锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "BOARD_FINAL_RESULT")]
+ public string? BoardFinalResult { get; set; }
- /// <summary>
- /// 鎷兼澘鍣ㄤ欢鏁伴噺锛堝崟鏉挎暟鎹娇鐢級
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_COMP_NUMBER")]
- public int? BoardCompNumber { get; set; }
+ /// <summary>
+ /// 鎷兼澘鍣ㄤ欢鏁伴噺锛堝崟鏉挎暟鎹娇鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "BOARD_COMP_NUMBER")]
+ public int? BoardCompNumber { get; set; }
- /// <summary>
- /// 鎷兼澘鍣ㄤ欢妫�娴婲G鎬绘暟锛堝崟鏉挎暟鎹娇鐢級
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_COMP_ROBOT_NG_NUMBER")]
- public int? BoardCompRobotNgNumber { get; set; }
+ /// <summary>
+ /// 鎷兼澘鍣ㄤ欢妫�娴婲G鎬绘暟锛堝崟鏉挎暟鎹娇鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "BOARD_COMP_ROBOT_NG_NUMBER")]
+ public int? BoardCompRobotNgNumber { get; set; }
- /// <summary>
- /// 鎷兼澘鍣ㄤ欢澶嶅垽NG鎬绘暟锛堝崟鏉挎暟鎹娇鐢級
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_COMP_USER_NG_NUMBER")]
- public int? BoardCompUserNgNumber { get; set; }
+ /// <summary>
+ /// 鎷兼澘鍣ㄤ欢澶嶅垽NG鎬绘暟锛堝崟鏉挎暟鎹娇鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "BOARD_COMP_USER_NG_NUMBER")]
+ public int? BoardCompUserNgNumber { get; set; }
- /// <summary>
- /// 鎷兼澘鍣ㄤ欢璇姤鎬绘暟锛堝崟鏉挎暟鎹娇鐢級
- /// </summary>
- [SugarColumn(ColumnName = "BOARD_COMP_REPASS_NUMBER")]
- public int? BoardCompRepassNumber { get; set; }
+ /// <summary>
+ /// 鎷兼澘鍣ㄤ欢璇姤鎬绘暟锛堝崟鏉挎暟鎹娇鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "BOARD_COMP_REPASS_NUMBER")]
+ public int? BoardCompRepassNumber { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_TIME")]
- public DateTime? CreateTime { get; set; }
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_TIME")]
+ public DateTime? CreateTime { get; set; }
- /// <summary>
- /// 鏇存柊鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "UPDATE_TIME")]
- public DateTime? UpdateTime { get; set; }
+ /// <summary>
+ /// 鏇存柊鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "UPDATE_TIME")]
+ public DateTime? UpdateTime { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "REMARKS")]
- public string? Remarks { get; set; }
- }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARKS")]
+ public string? Remarks { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQa.cs b/MES.Service/Modes/MesQa.cs
index 8d25995..db9aad6 100644
--- a/MES.Service/Modes/MesQa.cs
+++ b/MES.Service/Modes/MesQa.cs
@@ -72,7 +72,7 @@
public string? QsType { get; set; }
/// <summary>
- /// 鐗╂枡id
+ /// 鐗╂枡id
/// </summary>
[Column("ITEM_ID")]
[SugarColumn(ColumnName = "ITEM_ID")] //鐢ㄤ簬SqlSugar
diff --git a/MES.Service/Modes/MesQaItemsDetect01.cs b/MES.Service/Modes/MesQaItemsDetect01.cs
index 14760fb..2a26d0c 100644
--- a/MES.Service/Modes/MesQaItemsDetect01.cs
+++ b/MES.Service/Modes/MesQaItemsDetect01.cs
@@ -8,324 +8,324 @@
[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>
- /// 妗ｄ綅鏍囧噯
- /// </summary>
- [SugarColumn(ColumnName = "FGEAR_STAND")]
+ /// <summary>
+ /// 妗ｄ綅鏍囧噯
+ /// </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; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQaItemsDetectDetail5.cs b/MES.Service/Modes/MesQaItemsDetectDetail5.cs
index 68ee666..d6159cc 100644
--- a/MES.Service/Modes/MesQaItemsDetectDetail5.cs
+++ b/MES.Service/Modes/MesQaItemsDetectDetail5.cs
@@ -8,167 +8,167 @@
[SugarTable("MES_QA_ITEMS_DETECT_DETAIL5")]
public class MesQaItemsDetectDetail5
{
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
- /// <summary>
- /// 鏍囧噯鍊肩被鍨�
- /// </summary>
- [SugarColumn(ColumnName = "FTEXT_TYPE")]
+ /// <summary>
+ /// 鏍囧噯鍊肩被鍨�
+ /// </summary>
+ [SugarColumn(ColumnName = "FTEXT_TYPE")]
public string FtextType { get; set; }
- /// <summary>
- /// 鏍囧噯鍊�
- /// </summary>
- [SugarColumn(ColumnName = "FSTAND")]
+ /// <summary>
+ /// 鏍囧噯鍊�
+ /// </summary>
+ [SugarColumn(ColumnName = "FSTAND")]
public decimal? Fstand { get; set; }
- /// <summary>
- /// 涓婂叕宸�
- /// </summary>
- [SugarColumn(ColumnName = "FUP_ALLOW")]
+ /// <summary>
+ /// 涓婂叕宸�
+ /// </summary>
+ [SugarColumn(ColumnName = "FUP_ALLOW")]
public string FupAllow { get; set; }
- /// <summary>
- /// 涓嬪叕宸�
- /// </summary>
- [SugarColumn(ColumnName = "FDOWN_ALLOW")]
+ /// <summary>
+ /// 涓嬪叕宸�
+ /// </summary>
+ [SugarColumn(ColumnName = "FDOWN_ALLOW")]
public string FdownAllow { 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 = "FCHECK_ITEM")]
+ /// <summary>
+ /// 妫�楠岄」鐩�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_ITEM")]
public string FcheckItem { get; set; }
- /// <summary>
- /// 瑙勬牸瑕佹眰
- /// </summary>
- [SugarColumn(ColumnName = "FSPEC_REQU")]
+ /// <summary>
+ /// 瑙勬牸瑕佹眰
+ /// </summary>
+ [SugarColumn(ColumnName = "FSPEC_REQU")]
public string FspecRequ { get; set; }
- /// <summary>
- /// 鎶芥鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_QYT")]
+ /// <summary>
+ /// 鎶芥鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_QYT")]
public decimal? CheckQyt { get; set; }
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_RESU")]
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_RESU")]
public string FcheckResu { get; set; }
- /// <summary>
- /// AC鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "FAC_QTY")]
+ /// <summary>
+ /// AC鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "FAC_QTY")]
public decimal? FacQty { get; set; }
- /// <summary>
- /// RE鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "FRE_QTY")]
+ /// <summary>
+ /// RE鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "FRE_QTY")]
public decimal? FreQty { get; set; }
- /// <summary>
- /// 涓嶅悎鏍兼暟
- /// </summary>
- [SugarColumn(ColumnName = "FNG_QTY")]
+ /// <summary>
+ /// 涓嶅悎鏍兼暟
+ /// </summary>
+ [SugarColumn(ColumnName = "FNG_QTY")]
public decimal? FngQty { get; set; }
- /// <summary>
- /// 涓嶈壇鐜�
- /// </summary>
- [SugarColumn(ColumnName = "FNG_RATE")]
+ /// <summary>
+ /// 涓嶈壇鐜�
+ /// </summary>
+ [SugarColumn(ColumnName = "FNG_RATE")]
public decimal? FngRate { get; set; }
- /// <summary>
- /// 宸插綍鍏ユ暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "FENTER_QTY")]
+ /// <summary>
+ /// 宸插綍鍏ユ暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "FENTER_QTY")]
public decimal? FenterQty { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "RELEASE_NO")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "RELEASE_NO")]
public string ReleaseNo { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
public string Company { get; set; }
- /// <summary>
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
public string Factory { get; set; }
- /// <summary>
- /// 妫�楠岄」鐩弿杩�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_ITEM_DESC")]
+ /// <summary>
+ /// 妫�楠岄」鐩弿杩�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_ITEM_DESC")]
public string FcheckItemDesc { get; set; }
- /// <summary>
- /// 宸ュ簭鍙�
- /// </summary>
- [SugarColumn(ColumnName = "PROC_NO")]
+ /// <summary>
+ /// 宸ュ簭鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "PROC_NO")]
public string ProcNo { get; set; }
- /// <summary>
- /// 宸ヤ綔涓績缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")]
+ /// <summary>
+ /// 宸ヤ綔涓績缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "WORKSHOP_CENTER_CODE")]
public string WorkshopCenterCode { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "FUNIT")]
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "FUNIT")]
public string Funit { get; set; }
- /// <summary>
- /// 鐗瑰畾淇敼
- /// </summary>
- [SugarColumn(ColumnName = "GIVEN_MODIFY")]
+ /// <summary>
+ /// 鐗瑰畾淇敼
+ /// </summary>
+ [SugarColumn(ColumnName = "GIVEN_MODIFY")]
public short? GivenModify { get; set; }
- /// <summary>
- /// 妫�楠屽伐鍏�
- /// </summary>
- [SugarColumn(ColumnName = "FCHECK_TOOL")]
+ /// <summary>
+ /// 妫�楠屽伐鍏�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_TOOL")]
public string FcheckTool { 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; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesQualityStandard.cs b/MES.Service/Modes/MesQualityStandard.cs
index e4f3fad..1c8487f 100644
--- a/MES.Service/Modes/MesQualityStandard.cs
+++ b/MES.Service/Modes/MesQualityStandard.cs
@@ -203,8 +203,8 @@
public string UsingInstruments { 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/Organize.cs b/MES.Service/Modes/Organize.cs
index 96b15b1..1a6f4aa 100644
--- a/MES.Service/Modes/Organize.cs
+++ b/MES.Service/Modes/Organize.cs
@@ -25,25 +25,25 @@
public string? Fname { get; set; }
/// <summary>
- /// 鏄惁鍚敤
+ /// 鏄惁鍚敤
/// </summary>
[SugarColumn(ColumnName = "FFORBIDSTATUS")]
public string? Fforbidstatus { get; set; }
/// <summary>
- /// 鎿嶄綔绫诲瀷
+ /// 鎿嶄綔绫诲瀷
/// </summary>
[SugarColumn(ColumnName = "TYPE")]
public string? Type { get; set; }
/// <summary>
- /// 涓婄骇缁勭粐
+ /// 涓婄骇缁勭粐
/// </summary>
[SugarColumn(ColumnName = "FPARENTID")]
public string? Fparentid { get; set; }
/// <summary>
- /// 鍒涘缓鏃堕棿
+ /// 鍒涘缓鏃堕棿
/// </summary>
[SugarColumn(ColumnName = "FCREATEDATE")]
public DateTime? Fcreatedate { get; set; }
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/SalesDeliveryNotice.cs b/MES.Service/Modes/SalesDeliveryNotice.cs
index 0146a9a..125115b 100644
--- a/MES.Service/Modes/SalesDeliveryNotice.cs
+++ b/MES.Service/Modes/SalesDeliveryNotice.cs
@@ -1,236 +1,274 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-namespace MES.Service.Modes
+锘縰sing SqlSugar;
+
+namespace MES.Service.Modes;
+
+/// <summary>
+/// 閿�鍞彂璐ч�氱煡鍗�
+/// </summary>
+[SugarTable("SALES_DELIVERY_NOTICE")]
+public class SalesDeliveryNotice
{
- /// <summary>
- /// 閿�鍞彂璐ч�氱煡鍗�
- ///</summary>
- [SugarTable("SALES_DELIVERY_NOTICE")]
- public class SalesDeliveryNotice
- {
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName="ID", OracleSequenceName = "SEQ_SALES", IsPrimaryKey = true)]
- public decimal? Id { get; set; }
- /// <summary>
- /// 鍗曟嵁绫诲瀷
- ///</summary>
- [SugarColumn(ColumnName="BILL_TYPE" )]
- public string? BillType { get; set; }
- /// <summary>
- /// 鍗曟嵁缂栧彿
- ///</summary>
- [SugarColumn(ColumnName="BILL_NO" )]
- public string? BillNo { get; set; }
- /// <summary>
- /// 鏃ユ湡
- ///</summary>
- [SugarColumn(ColumnName="F_DATE" )]
- public DateTime? FDate { get; set; }
- /// <summary>
- /// 缁撶畻甯佸埆
- ///</summary>
- [SugarColumn(ColumnName="CURRENCY" )]
- public string? Currency { get; set; }
- /// <summary>
- /// 閿�鍞粍缁�
- ///</summary>
- [SugarColumn(ColumnName="SALES_ORG" )]
- public string? SalesOrg { get; set; }
- /// <summary>
- /// 閿�鍞儴闂�
- ///</summary>
- [SugarColumn(ColumnName="SALES_DEPT" )]
- public string? SalesDept { get; set; }
- /// <summary>
- /// 瀹㈡埛璁㈠崟
- ///</summary>
- [SugarColumn(ColumnName="CUSTOMER_ORDER_NO" )]
- public string? CustomerOrderNo { get; set; }
- /// <summary>
- /// 瀹㈡埛
- ///</summary>
- [SugarColumn(ColumnName="CUSTOMER" )]
- public string? Customer { get; set; }
- /// <summary>
- /// 娣樺疂瀹㈡埛澶囨敞
- ///</summary>
- [SugarColumn(ColumnName="TAOBAO_REMARK" )]
- public string? TaobaoRemark { get; set; }
- /// <summary>
- /// 浜よ揣鏂瑰紡
- ///</summary>
- [SugarColumn(ColumnName="DELIVERY_METHOD" )]
- public string? DeliveryMethod { get; set; }
- /// <summary>
- /// 浜よ揣鍦扮偣
- ///</summary>
- [SugarColumn(ColumnName="DELIVERY_LOCATION" )]
- public string? DeliveryLocation { get; set; }
- /// <summary>
- /// 鎵胯繍鍟�
- ///</summary>
- [SugarColumn(ColumnName="CARRIER" )]
- public string? Carrier { get; set; }
- /// <summary>
- /// 杩愯緭鍗曞彿
- ///</summary>
- [SugarColumn(ColumnName="TRANSPORT_NO" )]
- public string? TransportNo { get; set; }
- /// <summary>
- /// 鍗曟嵁鐘舵��
- ///</summary>
- [SugarColumn(ColumnName="BILL_NO_TYPE" )]
- public string? BillNoType { get; set; }
- /// <summary>
- /// 鍙戣揣缁勭粐
- ///</summary>
- [SugarColumn(ColumnName="DELIVERY_ORG" )]
- public string? DeliveryOrg { get; set; }
- /// <summary>
- /// 鍙戣揣閮ㄩ棬
- ///</summary>
- [SugarColumn(ColumnName="DELIVERY_DEPT" )]
- public string? DeliveryDept { get; set; }
- /// <summary>
- /// 搴撳瓨缁�
- ///</summary>
- [SugarColumn(ColumnName="INVENTORY_GROUP" )]
- public string? InventoryGroup { get; set; }
- /// <summary>
- /// 浠撶鍛�
- ///</summary>
- [SugarColumn(ColumnName="WAREHOUSE_MANAGER" )]
- public string? WarehouseManager { get; set; }
- /// <summary>
- /// 閿�鍞粍
- ///</summary>
- [SugarColumn(ColumnName="SALES_GROUP" )]
- public string? SalesGroup { get; set; }
- /// <summary>
- /// 閿�鍞憳
- ///</summary>
- [SugarColumn(ColumnName="SALES_PERSON" )]
- public string? SalesPerson { get; set; }
- /// <summary>
- /// 鏀惰揣鏂�
- ///</summary>
- [SugarColumn(ColumnName="RECEIVER" )]
- public string? Receiver { get; set; }
- /// <summary>
- /// 鏀惰揣鏂硅仈绯讳汉
- ///</summary>
- [SugarColumn(ColumnName="RECEIVER_CONTACT" )]
- public string? ReceiverContact { get; set; }
- /// <summary>
- /// 鏀惰揣鏂瑰湴鍧�
- ///</summary>
- [SugarColumn(ColumnName="RECEIVER_ADDRESS" )]
- public string? ReceiverAddress { get; set; }
- /// <summary>
- /// 鏀惰揣鏂瑰鍚�
- ///</summary>
- [SugarColumn(ColumnName="RECEIVER_NAME" )]
- public string? ReceiverName { get; set; }
- /// <summary>
- /// 鑱旂郴鐢佃瘽
- ///</summary>
- [SugarColumn(ColumnName="LINK_PHONE" )]
- public string? LinkPhone { get; set; }
- /// <summary>
- /// 缁撶畻鏂�
- ///</summary>
- [SugarColumn(ColumnName="SETTLE_PARTY" )]
- public string? SettleParty { get; set; }
- /// <summary>
- /// 浠樻鏂�
- ///</summary>
- [SugarColumn(ColumnName="PAYER_PARTY" )]
- public string? PayerParty { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- ///</summary>
- [SugarColumn(ColumnName="CREATED_BY" )]
- public string? CreatedBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- ///</summary>
- [SugarColumn(ColumnName="CREATED_DATE" )]
- public DateTime? CreatedDate { get; set; }
- /// <summary>
- /// 淇敼浜�
- ///</summary>
- [SugarColumn(ColumnName="MODIFIED_BY" )]
- public string? ModifiedBy { get; set; }
- /// <summary>
- /// 淇敼鏃堕棿
- ///</summary>
- [SugarColumn(ColumnName="MODIFIED_DATE" )]
- public DateTime? ModifiedDate { get; set; }
- /// <summary>
- /// 鍏抽棴浜�
- ///</summary>
- [SugarColumn(ColumnName="CLOSED_BY" )]
- public string? ClosedBy { get; set; }
- /// <summary>
- /// 鍏抽棴鍘熷洜
- ///</summary>
- [SugarColumn(ColumnName="CLOSE_REASON" )]
- public string? CloseReason { get; set; }
- /// <summary>
- /// 鍏抽棴鏃ユ湡
- ///</summary>
- [SugarColumn(ColumnName="CLOSE_DATE" )]
- public DateTime? CloseDate { get; set; }
- /// <summary>
- /// 瀹℃牳浜�
- ///</summary>
- [SugarColumn(ColumnName="APPROVED_BY" )]
- public string? ApprovedBy { get; set; }
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- ///</summary>
- [SugarColumn(ColumnName="APPROVED_DATE" )]
- public DateTime? ApprovedDate { get; set; }
- /// <summary>
- /// 浣滃簾鐘舵��
- ///</summary>
- [SugarColumn(ColumnName="CANCEL_STATUS" )]
- public string? CancelStatus { get; set; }
- /// <summary>
- /// 浣滃簾浜�
- ///</summary>
- [SugarColumn(ColumnName="CANCELLED_BY" )]
- public string? CancelledBy { get; set; }
- /// <summary>
- /// 浣滃簾鏃ユ湡
- ///</summary>
- [SugarColumn(ColumnName="CANCEL_DATE" )]
- public DateTime? CancelDate { get; set; }
- /// <summary>
- /// 鍏抽棴鐘舵��
- ///</summary>
- [SugarColumn(ColumnName="CLOSE_STATUS" )]
- public string? CloseStatus { get; set; }
- /// <summary>
- /// 鏄惁鎵嬪姩鍏抽棴
- ///</summary>
- [SugarColumn(ColumnName="MANUAL_CLOSE_FLAG" )]
- public string? ManualCloseFlag { get; set; }
- /// <summary>
- /// ERP澶碔D
- ///</summary>
- [SugarColumn(ColumnName="ERP_ID" )]
- public string? ErpId { get; set; }
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES",
+ IsPrimaryKey = true)]
+ public decimal? Id { get; set; }
- /// <summary>
- /// 鍗曟嵁鐘舵��
- ///</summary>
- [SugarColumn(ColumnName = "BILL_STATUS")]
- public string? BillStatus { get; set; }
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_TYPE")]
+ public string? BillType { get; set; }
- }
-}
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
+ public string? BillNo { get; set; }
+
+ /// <summary>
+ /// 鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "F_DATE")]
+ public DateTime? FDate { get; set; }
+
+ /// <summary>
+ /// 缁撶畻甯佸埆
+ /// </summary>
+ [SugarColumn(ColumnName = "CURRENCY")]
+ public string? Currency { get; set; }
+
+ /// <summary>
+ /// 閿�鍞粍缁�
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_ORG")]
+ public string? SalesOrg { get; set; }
+
+ /// <summary>
+ /// 閿�鍞儴闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_DEPT")]
+ public string? SalesDept { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛璁㈠崟
+ /// </summary>
+ [SugarColumn(ColumnName = "CUSTOMER_ORDER_NO")]
+ public string? CustomerOrderNo { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛
+ /// </summary>
+ [SugarColumn(ColumnName = "CUSTOMER")]
+ public string? Customer { get; set; }
+
+ /// <summary>
+ /// 娣樺疂瀹㈡埛澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "TAOBAO_REMARK")]
+ public string? TaobaoRemark { get; set; }
+
+ /// <summary>
+ /// 浜よ揣鏂瑰紡
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_METHOD")]
+ public string? DeliveryMethod { get; set; }
+
+ /// <summary>
+ /// 浜よ揣鍦扮偣
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_LOCATION")]
+ public string? DeliveryLocation { get; set; }
+
+ /// <summary>
+ /// 鎵胯繍鍟�
+ /// </summary>
+ [SugarColumn(ColumnName = "CARRIER")]
+ public string? Carrier { get; set; }
+
+ /// <summary>
+ /// 杩愯緭鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "TRANSPORT_NO")]
+ public string? TransportNo { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_NO_TYPE")]
+ public string? BillNoType { get; set; }
+
+ /// <summary>
+ /// 鍙戣揣缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_ORG")]
+ public string? DeliveryOrg { get; set; }
+
+ /// <summary>
+ /// 鍙戣揣閮ㄩ棬
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_DEPT")]
+ public string? DeliveryDept { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨缁�
+ /// </summary>
+ [SugarColumn(ColumnName = "INVENTORY_GROUP")]
+ public string? InventoryGroup { get; set; }
+
+ /// <summary>
+ /// 浠撶鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "WAREHOUSE_MANAGER")]
+ public string? WarehouseManager { get; set; }
+
+ /// <summary>
+ /// 閿�鍞粍
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_GROUP")]
+ public string? SalesGroup { get; set; }
+
+ /// <summary>
+ /// 閿�鍞憳
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_PERSON")]
+ public string? SalesPerson { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣鏂�
+ /// </summary>
+ [SugarColumn(ColumnName = "RECEIVER")]
+ public string? Receiver { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣鏂硅仈绯讳汉
+ /// </summary>
+ [SugarColumn(ColumnName = "RECEIVER_CONTACT")]
+ public string? ReceiverContact { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣鏂瑰湴鍧�
+ /// </summary>
+ [SugarColumn(ColumnName = "RECEIVER_ADDRESS")]
+ public string? ReceiverAddress { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣鏂瑰鍚�
+ /// </summary>
+ [SugarColumn(ColumnName = "RECEIVER_NAME")]
+ public string? ReceiverName { get; set; }
+
+ /// <summary>
+ /// 鑱旂郴鐢佃瘽
+ /// </summary>
+ [SugarColumn(ColumnName = "LINK_PHONE")]
+ public string? LinkPhone { get; set; }
+
+ /// <summary>
+ /// 缁撶畻鏂�
+ /// </summary>
+ [SugarColumn(ColumnName = "SETTLE_PARTY")]
+ public string? SettleParty { get; set; }
+
+ /// <summary>
+ /// 浠樻鏂�
+ /// </summary>
+ [SugarColumn(ColumnName = "PAYER_PARTY")]
+ public string? PayerParty { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATED_BY")]
+ public string? CreatedBy { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATED_DATE")]
+ public DateTime? CreatedDate { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFIED_BY")]
+ public string? ModifiedBy { get; set; }
+
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFIED_DATE")]
+ public DateTime? ModifiedDate { get; set; }
+
+ /// <summary>
+ /// 鍏抽棴浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CLOSED_BY")]
+ public string? ClosedBy { get; set; }
+
+ /// <summary>
+ /// 鍏抽棴鍘熷洜
+ /// </summary>
+ [SugarColumn(ColumnName = "CLOSE_REASON")]
+ public string? CloseReason { get; set; }
+
+ /// <summary>
+ /// 鍏抽棴鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CLOSE_DATE")]
+ public DateTime? CloseDate { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "APPROVED_BY")]
+ public string? ApprovedBy { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "APPROVED_DATE")]
+ public DateTime? ApprovedDate { get; set; }
+
+ /// <summary>
+ /// 浣滃簾鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "CANCEL_STATUS")]
+ public string? CancelStatus { get; set; }
+
+ /// <summary>
+ /// 浣滃簾浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CANCELLED_BY")]
+ public string? CancelledBy { get; set; }
+
+ /// <summary>
+ /// 浣滃簾鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CANCEL_DATE")]
+ public DateTime? CancelDate { get; set; }
+
+ /// <summary>
+ /// 鍏抽棴鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "CLOSE_STATUS")]
+ public string? CloseStatus { get; set; }
+
+ /// <summary>
+ /// 鏄惁鎵嬪姩鍏抽棴
+ /// </summary>
+ [SugarColumn(ColumnName = "MANUAL_CLOSE_FLAG")]
+ public string? ManualCloseFlag { get; set; }
+
+ /// <summary>
+ /// ERP澶碔D
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_ID")]
+ public string? ErpId { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_STATUS")]
+ public string? BillStatus { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Modes/SalesDeliveryNoticeDetail.cs b/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
index ab2fae4..8856ea6 100644
--- a/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
+++ b/MES.Service/Modes/SalesDeliveryNoticeDetail.cs
@@ -1,210 +1,238 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-namespace MES.Service.Modes
+锘縰sing SqlSugar;
+
+namespace MES.Service.Modes;
+
+/// <summary>
+/// 閿�鍞彂璐ч�氱煡鍗曟槑缁嗚〃
+/// </summary>
+[SugarTable("SALES_DELIVERY_NOTICE_DETAIL")]
+public class SalesDeliveryNoticeDetail
{
- /// <summary>
- /// 閿�鍞彂璐ч�氱煡鍗曟槑缁嗚〃
- ///</summary>
- [SugarTable("SALES_DELIVERY_NOTICE_DETAIL")]
- public class SalesDeliveryNoticeDetail
- {
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName="ID", OracleSequenceName = "SEQ_SALES", IsPrimaryKey = true)]
- public decimal? Id { get; set; }
- /// <summary>
- /// 閿�鍞鍗曞彿
- ///</summary>
- [SugarColumn(ColumnName="SALES_ORDER_ID")]
- public string? SalesOrderId { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- ///</summary>
- [SugarColumn(ColumnName="MATERIAL_ID")]
- public string? MaterialId { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- ///</summary>
- [SugarColumn(ColumnName="MATERIAL_NAME")]
- public string? MaterialName { get; set; }
- /// <summary>
- /// 鐗╂枡瑙勬牸
- ///</summary>
- [SugarColumn(ColumnName="MATERIAL_SPECIFICATION")]
- public string? MaterialSpecification { get; set; }
- /// <summary>
- /// 閿�鍞崟浣�
- ///</summary>
- [SugarColumn(ColumnName="SALES_UNIT_ID")]
- public string? SalesUnitId { get; set; }
- /// <summary>
- /// 閿�鍞暟閲�
- ///</summary>
- [SugarColumn(ColumnName="SALES_QUANTITY")]
- public decimal? SalesQuantity { get; set; }
- /// <summary>
- /// 鏄惁璧犲搧
- ///</summary>
- [SugarColumn(ColumnName="IS_FREE")]
- public decimal IsFree { get; set; }
- /// <summary>
- /// 瑕佽揣鏃ユ湡
- ///</summary>
- [SugarColumn(ColumnName="DELIVERY_DATE")]
- public DateTime? DeliveryDate { get; set; }
- /// <summary>
- /// 鍑鸿揣浠撳簱
- ///</summary>
- [SugarColumn(ColumnName="WAREHOUSE")]
- public string? Warehouse { get; set; }
- /// <summary>
- /// 璁″垝璺熻釜鍙�
- ///</summary>
- [SugarColumn(ColumnName="PLAN_TRACKING_NUMBER")]
- public string? PlanTrackingNumber { get; set; }
- /// <summary>
- /// 鎵瑰彿
- ///</summary>
- [SugarColumn(ColumnName="LOT_NUMBER")]
- public string? LotNumber { get; set; }
- /// <summary>
- /// 婧愬崟缂栧彿
- ///</summary>
- [SugarColumn(ColumnName="SRC_BILL_NO")]
- public string? SrcBillNo { get; set; }
- /// <summary>
- /// 璁′环鏁伴噺
- ///</summary>
- [SugarColumn(ColumnName="PRICE_QTY")]
- public decimal? PriceQty { get; set; }
- /// <summary>
- /// 璐т富
- ///</summary>
- [SugarColumn(ColumnName="OWNER_ID")]
- public string? OwnerId { get; set; }
- /// <summary>
- /// 搴撳瓨鍗曚綅
- ///</summary>
- [SugarColumn(ColumnName="INVENTORY_UNIT")]
- public string? InventoryUnit { get; set; }
- /// <summary>
- /// 搴撳瓨鏁伴噺
- ///</summary>
- [SugarColumn(ColumnName="INVENTORY_QUANTITY")]
- public decimal? InventoryQuantity { get; set; }
- /// <summary>
- /// 鐗╂枡绫诲埆
- ///</summary>
- [SugarColumn(ColumnName="MATERIAL_CATEGORY")]
- public string? MaterialCategory { get; set; }
- /// <summary>
- /// 璁″垝鍙戣揣鏃ユ湡
- ///</summary>
- [SugarColumn(ColumnName="PLAN_DELIVERY_DATE")]
- public DateTime? PlanDeliveryDate { get; set; }
- /// <summary>
- /// 瓒呭彂鎺у埗鍗曚綅
- ///</summary>
- [SugarColumn(ColumnName="OUT_LMT_UNIT")]
- public string? OutLmtUnit { get; set; }
- /// <summary>
- /// 鍑哄簱涓婇檺
- ///</summary>
- [SugarColumn(ColumnName="OUT_MAX_QTY")]
- public decimal? OutMaxQty { get; set; }
- /// <summary>
- /// 鍑哄簱涓嬮檺
- ///</summary>
- [SugarColumn(ColumnName="OUT_MIN_QTY")]
- public decimal? OutMinQty { get; set; }
- /// <summary>
- /// 浜よ揣鍦扮偣
- ///</summary>
- [SugarColumn(ColumnName="DELIVERY_LOC")]
- public string? DeliveryLoc { get; set; }
- /// <summary>
- /// 浜よ揣鍦板潃
- ///</summary>
- [SugarColumn(ColumnName="DELIVERYL_ADDRESS")]
- public string? DeliverylAddress { get; set; }
- /// <summary>
- /// 婧愬崟鍗曞彿
- ///</summary>
- [SugarColumn(ColumnName="SOURCE_BILL_NO")]
- public string? SourceBillNo { get; set; }
- /// <summary>
- /// 璁㈠崟鍗曞彿
- ///</summary>
- [SugarColumn(ColumnName="ORDER_BILL_NO")]
- public string? OrderBillNo { get; set; }
- /// <summary>
- /// 缁堟鐘舵��
- ///</summary>
- [SugarColumn(ColumnName="TERMINATION_STATUS")]
- public string? TerminationStatus { get; set; }
- /// <summary>
- /// 缁堟鏃ユ湡
- ///</summary>
- [SugarColumn(ColumnName="TERMINATION_DATE")]
- public DateTime? TerminationDate { get; set; }
- /// <summary>
- /// 绱鍑哄簱鏁伴噺
- ///</summary>
- [SugarColumn(ColumnName="SUM_OUT_QTY")]
- public decimal? SumOutQty { get; set; }
- /// <summary>
- /// 鏈嚭搴撴暟閲�
- ///</summary>
- [SugarColumn(ColumnName="REMAIN_OUT_QTY")]
- public decimal? RemainOutQty { get; set; }
- /// <summary>
- /// ERP琛孖D
- ///</summary>
- [SugarColumn(ColumnName="ERP_LINE_ID")]
- public string? ErpLineId { get; set; }
- /// <summary>
- /// ERP澶碔D
- ///</summary>
- [SugarColumn(ColumnName="ERP_HEAD_ID")]
- public string? ErpHeadId { get; set; }
- /// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "SALES_ORDER")]
- public string? SalesOrder { get; set; }
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES",
+ IsPrimaryKey = true)]
+ public decimal? Id { get; set; }
- /// <summary>
- /// 瀹㈡埛璁㈠崟鍙�
- /// </summary>
- [SugarColumn(ColumnName = "CUST_ORDER")]
- public string? CustOrder { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_ORDER_ID")]
+ public string? SalesOrderId { get; set; }
- /// <summary>
- /// 閿�鍞悎鍚岀紪鍙�
- /// </summary>
- [SugarColumn(ColumnName = "SALES_CONTRACT_NO")]
- public string? SalesContractNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "MATERIAL_ID")]
+ public string? MaterialId { get; set; }
- /// <summary>
- /// 瀹㈡埛鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "F_KHWLMC")]
- public string? F_KHWLMC { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "MATERIAL_NAME")]
+ public string? MaterialName { get; set; }
- /// <summary>
- /// 瀹㈡埛鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "F_KHWLBM")]
- public string? F_KHWLBM { get; set; }
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [SugarColumn(ColumnName = "MATERIAL_SPECIFICATION")]
+ public string? MaterialSpecification { get; set; }
- /// <summary>
- /// 鏄惁瀹岀粨
- /// </summary>
- [SugarColumn(ColumnName = "IS_FINISH")]
- public decimal? IsFinish { get; set; }
- }
+ /// <summary>
+ /// 閿�鍞崟浣�
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_UNIT_ID")]
+ public string? SalesUnitId { get; set; }
-}
+ /// <summary>
+ /// 閿�鍞暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_QUANTITY")]
+ public decimal? SalesQuantity { get; set; }
+
+ /// <summary>
+ /// 鏄惁璧犲搧
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_FREE")]
+ public decimal IsFree { get; set; }
+
+ /// <summary>
+ /// 瑕佽揣鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_DATE")]
+ public DateTime? DeliveryDate { get; set; }
+
+ /// <summary>
+ /// 鍑鸿揣浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "WAREHOUSE")]
+ public string? Warehouse { get; set; }
+
+ /// <summary>
+ /// 璁″垝璺熻釜鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "PLAN_TRACKING_NUMBER")]
+ public string? PlanTrackingNumber { get; set; }
+
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NUMBER")]
+ public string? LotNumber { get; set; }
+
+ /// <summary>
+ /// 婧愬崟缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SRC_BILL_NO")]
+ public string? SrcBillNo { get; set; }
+
+ /// <summary>
+ /// 璁′环鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "PRICE_QTY")]
+ public decimal? PriceQty { get; set; }
+
+ /// <summary>
+ /// 璐т富
+ /// </summary>
+ [SugarColumn(ColumnName = "OWNER_ID")]
+ public string? OwnerId { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "INVENTORY_UNIT")]
+ public string? InventoryUnit { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "INVENTORY_QUANTITY")]
+ public decimal? InventoryQuantity { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡绫诲埆
+ /// </summary>
+ [SugarColumn(ColumnName = "MATERIAL_CATEGORY")]
+ public string? MaterialCategory { get; set; }
+
+ /// <summary>
+ /// 璁″垝鍙戣揣鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "PLAN_DELIVERY_DATE")]
+ public DateTime? PlanDeliveryDate { get; set; }
+
+ /// <summary>
+ /// 瓒呭彂鎺у埗鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "OUT_LMT_UNIT")]
+ public string? OutLmtUnit { get; set; }
+
+ /// <summary>
+ /// 鍑哄簱涓婇檺
+ /// </summary>
+ [SugarColumn(ColumnName = "OUT_MAX_QTY")]
+ public decimal? OutMaxQty { get; set; }
+
+ /// <summary>
+ /// 鍑哄簱涓嬮檺
+ /// </summary>
+ [SugarColumn(ColumnName = "OUT_MIN_QTY")]
+ public decimal? OutMinQty { get; set; }
+
+ /// <summary>
+ /// 浜よ揣鍦扮偣
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_LOC")]
+ public string? DeliveryLoc { get; set; }
+
+ /// <summary>
+ /// 浜よ揣鍦板潃
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERYL_ADDRESS")]
+ public string? DeliverylAddress { get; set; }
+
+ /// <summary>
+ /// 婧愬崟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SOURCE_BILL_NO")]
+ public string? SourceBillNo { get; set; }
+
+ /// <summary>
+ /// 璁㈠崟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ORDER_BILL_NO")]
+ public string? OrderBillNo { get; set; }
+
+ /// <summary>
+ /// 缁堟鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "TERMINATION_STATUS")]
+ public string? TerminationStatus { get; set; }
+
+ /// <summary>
+ /// 缁堟鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "TERMINATION_DATE")]
+ public DateTime? TerminationDate { get; set; }
+
+ /// <summary>
+ /// 绱鍑哄簱鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "SUM_OUT_QTY")]
+ public decimal? SumOutQty { get; set; }
+
+ /// <summary>
+ /// 鏈嚭搴撴暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "REMAIN_OUT_QTY")]
+ public decimal? RemainOutQty { get; set; }
+
+ /// <summary>
+ /// ERP琛孖D
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_LINE_ID")]
+ public string? ErpLineId { get; set; }
+
+ /// <summary>
+ /// ERP澶碔D
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_HEAD_ID")]
+ public string? ErpHeadId { get; set; }
+
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_ORDER")]
+ public string? SalesOrder { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛璁㈠崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "CUST_ORDER")]
+ public string? CustOrder { get; set; }
+
+ /// <summary>
+ /// 閿�鍞悎鍚岀紪鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_CONTRACT_NO")]
+ public string? SalesContractNo { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "F_KHWLMC")]
+ public string? F_KHWLMC { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "F_KHWLBM")]
+ public string? F_KHWLBM { get; set; }
+
+ /// <summary>
+ /// 鏄惁瀹岀粨
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_FINISH")]
+ public decimal? IsFinish { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Modes/SalesOrder.cs b/MES.Service/Modes/SalesOrder.cs
index 7a5b386..ffbaf1f 100644
--- a/MES.Service/Modes/SalesOrder.cs
+++ b/MES.Service/Modes/SalesOrder.cs
@@ -11,7 +11,8 @@
/// <summary>
/// SEQ_sales搴忓垪
/// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_XSDD",IsPrimaryKey = true)]
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_XSDD",
+ IsPrimaryKey = true)]
public decimal? Id { get; set; }
[SugarColumn(ColumnName = "ERP_ID")]
@@ -106,6 +107,4 @@
[SugarColumn(ColumnName = "ENTRY_NOTE")]
public string? EntryNote { get; set; } // 澶囨敞
-
-
}
\ No newline at end of file
diff --git a/MES.Service/Modes/SalesOrderDetail.cs b/MES.Service/Modes/SalesOrderDetail.cs
index 4650faa..b0516b7 100644
--- a/MES.Service/Modes/SalesOrderDetail.cs
+++ b/MES.Service/Modes/SalesOrderDetail.cs
@@ -11,7 +11,8 @@
/// <summary>
/// SEQ_sales搴忓垪
/// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_XSDD_MX",IsPrimaryKey = true)]
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_XSDD_MX",
+ IsPrimaryKey = true)]
public decimal Id { get; set; }
/// <summary>
@@ -195,25 +196,25 @@
public string? SalesOrder { get; set; }
/// <summary>
- /// 瀹㈡埛璁㈠崟鍙�
+ /// 瀹㈡埛璁㈠崟鍙�
/// </summary>
[SugarColumn(ColumnName = "CUST_ORDER")]
public string? CustOrder { get; set; }
/// <summary>
- /// 閿�鍞悎鍚岀紪鍙�
+ /// 閿�鍞悎鍚岀紪鍙�
/// </summary>
[SugarColumn(ColumnName = "SALES_CONTRACT_NO")]
public string? SalesContractNo { get; set; }
/// <summary>
- /// 鎴愬搧鏂欏彿
+ /// 鎴愬搧鏂欏彿
/// </summary>
[SugarColumn(ColumnName = "ITEM_NO")]
public string? ItemNo { get; set; }
/// <summary>
- /// 鎴愬搧鍚嶇О
+ /// 鎴愬搧鍚嶇О
/// </summary>
[SugarColumn(ColumnName = "ITEM_NAME")]
public string? ItemName { get; set; }
@@ -225,7 +226,7 @@
public string? CustId { get; set; }
/// <summary>
- /// 閲囪喘鍒拌揣鏃ユ湡
+ /// 閲囪喘鍒拌揣鏃ユ湡
/// </summary>
[SugarColumn(ColumnName = "ARRIVAL_DATE")]
@@ -242,6 +243,4 @@
/// </summary>
[SugarColumn(ColumnName = "DDLY")]
public string? Ddly { get; set; }
-
-
}
\ No newline at end of file
diff --git a/MES.Service/Modes/SalesReturnNotice.cs b/MES.Service/Modes/SalesReturnNotice.cs
index 3ca8eb3..e210ca5 100644
--- a/MES.Service/Modes/SalesReturnNotice.cs
+++ b/MES.Service/Modes/SalesReturnNotice.cs
@@ -1,214 +1,250 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-namespace MES.Service.Modes
+锘縰sing SqlSugar;
+
+namespace MES.Service.Modes;
+
+/// <summary>
+/// 閿�鍞��璐ч�氱煡鍗曡〃
+/// </summary>
+[SugarTable("SALES_RETURN_NOTICE")]
+public class SalesReturnNotice
{
/// <summary>
- /// 閿�鍞��璐ч�氱煡鍗曡〃
- ///</summary>
- [SugarTable("SALES_RETURN_NOTICE")]
- public class SalesReturnNotice
- {
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)]
- public decimal? Id { get; set; }
- /// <summary>
- /// 鍗曟嵁绫诲瀷
- ///</summary>
- [SugarColumn(ColumnName = "BILL_TYPE")]
- public string BillType { get; set; }
- /// <summary>
- /// 鍗曟嵁缂栧彿
- ///</summary>
- [SugarColumn(ColumnName = "BILL_NO")]
- public string BillNo { get; set; }
- /// <summary>
- /// 鏃ユ湡
- ///</summary>
- [SugarColumn(ColumnName = "F_DATE")]
- public DateTime? FDate { get; set; }
- /// <summary>
- /// 缁撶畻甯佸埆
- ///</summary>
- [SugarColumn(ColumnName = "CURRENCY")]
- public string Currency { get; set; }
- /// <summary>
- /// 閿�鍞粍缁�
- ///</summary>
- [SugarColumn(ColumnName = "SALES_ORG")]
- public string SalesOrg { get; set; }
- /// <summary>
- /// 閿�鍞儴闂�
- ///</summary>
- [SugarColumn(ColumnName = "SALES_DEPT")]
- public string SalesDept { get; set; }
- /// <summary>
- /// 瀹㈡埛璁㈠崟
- ///</summary>
- [SugarColumn(ColumnName = "CUSTOMER_ORDER_NO")]
- public string CustomerOrderNo { get; set; }
- /// <summary>
- /// 閫�璐у鎴�
- ///</summary>
- [SugarColumn(ColumnName = "RETURN_CUSTOMER")]
- public string ReturnCustomer { get; set; }
- /// <summary>
- /// 娣樺疂瀹㈡埛澶囨敞
- ///</summary>
- [SugarColumn(ColumnName = "TAOBAO_REMARK")]
- public string TaobaoRemark { get; set; }
- /// <summary>
- /// 閫�璐у師鍥�
- ///</summary>
- [SugarColumn(ColumnName = "RETURN_REASON")]
- public string ReturnReason { get; set; }
- /// <summary>
- /// 浜よ揣鍦扮偣
- ///</summary>
- [SugarColumn(ColumnName = "DELIVERY_LOCATION")]
- public string DeliveryLocation { get; set; }
- /// <summary>
- /// 搴撳瓨缁勭粐
- ///</summary>
- [SugarColumn(ColumnName = "INVENTORY_ORG")]
- public string InventoryOrg { get; set; }
- /// <summary>
- /// 搴撳瓨閮ㄩ棬
- ///</summary>
- [SugarColumn(ColumnName = "INVENTORY_DEPT")]
- public string InventoryDept { get; set; }
- /// <summary>
- /// 搴撳瓨缁�
- ///</summary>
- [SugarColumn(ColumnName = "INVENTORY_GROUP")]
- public string InventoryGroup { get; set; }
- /// <summary>
- /// 浠撶鍛�
- ///</summary>
- [SugarColumn(ColumnName = "WAREHOUSE_MANAGER")]
- public string WarehouseManager { get; set; }
- /// <summary>
- /// 閿�鍞粍
- ///</summary>
- [SugarColumn(ColumnName = "SALES_GROUP")]
- public string SalesGroup { get; set; }
- /// <summary>
- /// 閿�鍞憳
- ///</summary>
- [SugarColumn(ColumnName = "SALES_PERSON")]
- public string SalesPerson { get; set; }
- /// <summary>
- /// 蹇�掑崟鍙�
- ///</summary>
- [SugarColumn(ColumnName = "EXPRESS_NO")]
- public string ExpressNo { get; set; }
- /// <summary>
- /// 鏀惰揣鏂�
- ///</summary>
- [SugarColumn(ColumnName = "RECEIVER")]
- public string Receiver { get; set; }
- /// <summary>
- /// 鏀惰揣鏂硅仈绯讳汉
- ///</summary>
- [SugarColumn(ColumnName = "RECEIVER_CONTACT")]
- public string ReceiverContact { get; set; }
- /// <summary>
- /// 鏀惰揣鏂瑰湴鍧�
- ///</summary>
- [SugarColumn(ColumnName = "RECEIVER_ADDRESS")]
- public string ReceiverAddress { get; set; }
- /// <summary>
- /// 鏀惰揣鏂瑰鍚�
- ///</summary>
- [SugarColumn(ColumnName = "RECEIVER_NAME")]
- public string ReceiverName { get; set; }
- /// <summary>
- /// 缁撶畻鏂�
- ///</summary>
- [SugarColumn(ColumnName = "SETTLE_PARTY")]
- public string SettleParty { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- ///</summary>
- [SugarColumn(ColumnName = "CREATED_BY")]
- public string CreatedBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- ///</summary>
- [SugarColumn(ColumnName = "CREATED_DATE")]
- public DateTime? CreatedDate { get; set; }
- /// <summary>
- /// 淇敼浜�
- ///</summary>
- [SugarColumn(ColumnName = "MODIFIED_BY")]
- public string ModifiedBy { get; set; }
- /// <summary>
- /// 淇敼鏃堕棿
- ///</summary>
- [SugarColumn(ColumnName = "MODIFIED_DATE")]
- public DateTime? ModifiedDate { get; set; }
- /// <summary>
- /// 鍏抽棴浜�
- ///</summary>
- [SugarColumn(ColumnName = "CLOSED_BY")]
- public string ClosedBy { get; set; }
- /// <summary>
- /// 鍏抽棴鍘熷洜
- ///</summary>
- [SugarColumn(ColumnName = "CLOSE_REASON")]
- public string CloseReason { get; set; }
- /// <summary>
- /// 鍏抽棴鏃ユ湡
- ///</summary>
- [SugarColumn(ColumnName = "CLOSE_DATE")]
- public DateTime? CloseDate { get; set; }
- /// <summary>
- /// 瀹℃牳浜�
- ///</summary>
- [SugarColumn(ColumnName = "APPROVED_BY")]
- public string ApprovedBy { get; set; }
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- ///</summary>
- [SugarColumn(ColumnName = "APPROVED_DATE")]
- public DateTime? ApprovedDate { get; set; }
- /// <summary>
- /// 浣滃簾鐘舵��
- ///</summary>
- [SugarColumn(ColumnName = "CANCEL_STATUS")]
- public string CancelStatus { get; set; }
- /// <summary>
- /// 浣滃簾浜�
- ///</summary>
- [SugarColumn(ColumnName = "CANCELLED_BY")]
- public string CancelledBy { get; set; }
- /// <summary>
- /// 浣滃簾鏃ユ湡
- ///</summary>
- [SugarColumn(ColumnName = "CANCEL_DATE")]
- public DateTime? CancelDate { get; set; }
- /// <summary>
- /// 鍏抽棴鐘舵��
- ///</summary>
- [SugarColumn(ColumnName = "CLOSE_STATUS")]
- public string CloseStatus { get; set; }
- /// <summary>
- /// 鏄惁鎵嬪姩鍏抽棴
- ///</summary>
- [SugarColumn(ColumnName = "MANUAL_CLOSE_FLAG")]
- public string ManualCloseFlag { get; set; }
- /// <summary>
- /// ERP澶碔D
- ///</summary>
- [SugarColumn(ColumnName = "ERP_ID")]
- public string ErpId { get; set; }
- /// <summary>
- /// 鍗曟嵁鐘舵��
- ///</summary>
- [SugarColumn(ColumnName = "BILL_STATUS")]
- public string BillStatus { get; set; }
- }
-}
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
+ IsPrimaryKey = true)]
+ public decimal? Id { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_TYPE")]
+ public string BillType { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
+ public string BillNo { get; set; }
+
+ /// <summary>
+ /// 鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "F_DATE")]
+ public DateTime? FDate { get; set; }
+
+ /// <summary>
+ /// 缁撶畻甯佸埆
+ /// </summary>
+ [SugarColumn(ColumnName = "CURRENCY")]
+ public string Currency { get; set; }
+
+ /// <summary>
+ /// 閿�鍞粍缁�
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_ORG")]
+ public string SalesOrg { get; set; }
+
+ /// <summary>
+ /// 閿�鍞儴闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_DEPT")]
+ public string SalesDept { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛璁㈠崟
+ /// </summary>
+ [SugarColumn(ColumnName = "CUSTOMER_ORDER_NO")]
+ public string CustomerOrderNo { get; set; }
+
+ /// <summary>
+ /// 閫�璐у鎴�
+ /// </summary>
+ [SugarColumn(ColumnName = "RETURN_CUSTOMER")]
+ public string ReturnCustomer { get; set; }
+
+ /// <summary>
+ /// 娣樺疂瀹㈡埛澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "TAOBAO_REMARK")]
+ public string TaobaoRemark { get; set; }
+
+ /// <summary>
+ /// 閫�璐у師鍥�
+ /// </summary>
+ [SugarColumn(ColumnName = "RETURN_REASON")]
+ public string ReturnReason { get; set; }
+
+ /// <summary>
+ /// 浜よ揣鍦扮偣
+ /// </summary>
+ [SugarColumn(ColumnName = "DELIVERY_LOCATION")]
+ public string DeliveryLocation { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "INVENTORY_ORG")]
+ public string InventoryOrg { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨閮ㄩ棬
+ /// </summary>
+ [SugarColumn(ColumnName = "INVENTORY_DEPT")]
+ public string InventoryDept { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨缁�
+ /// </summary>
+ [SugarColumn(ColumnName = "INVENTORY_GROUP")]
+ public string InventoryGroup { get; set; }
+
+ /// <summary>
+ /// 浠撶鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "WAREHOUSE_MANAGER")]
+ public string WarehouseManager { get; set; }
+
+ /// <summary>
+ /// 閿�鍞粍
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_GROUP")]
+ public string SalesGroup { get; set; }
+
+ /// <summary>
+ /// 閿�鍞憳
+ /// </summary>
+ [SugarColumn(ColumnName = "SALES_PERSON")]
+ public string SalesPerson { get; set; }
+
+ /// <summary>
+ /// 蹇�掑崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "EXPRESS_NO")]
+ public string ExpressNo { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣鏂�
+ /// </summary>
+ [SugarColumn(ColumnName = "RECEIVER")]
+ public string Receiver { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣鏂硅仈绯讳汉
+ /// </summary>
+ [SugarColumn(ColumnName = "RECEIVER_CONTACT")]
+ public string ReceiverContact { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣鏂瑰湴鍧�
+ /// </summary>
+ [SugarColumn(ColumnName = "RECEIVER_ADDRESS")]
+ public string ReceiverAddress { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣鏂瑰鍚�
+ /// </summary>
+ [SugarColumn(ColumnName = "RECEIVER_NAME")]
+ public string ReceiverName { get; set; }
+
+ /// <summary>
+ /// 缁撶畻鏂�
+ /// </summary>
+ [SugarColumn(ColumnName = "SETTLE_PARTY")]
+ public string SettleParty { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATED_BY")]
+ public string CreatedBy { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATED_DATE")]
+ public DateTime? CreatedDate { get; set; }
+
+ /// <summary>
+ /// 淇敼浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFIED_BY")]
+ public string ModifiedBy { get; set; }
+
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFIED_DATE")]
+ public DateTime? ModifiedDate { get; set; }
+
+ /// <summary>
+ /// 鍏抽棴浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CLOSED_BY")]
+ public string ClosedBy { get; set; }
+
+ /// <summary>
+ /// 鍏抽棴鍘熷洜
+ /// </summary>
+ [SugarColumn(ColumnName = "CLOSE_REASON")]
+ public string CloseReason { get; set; }
+
+ /// <summary>
+ /// 鍏抽棴鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CLOSE_DATE")]
+ public DateTime? CloseDate { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "APPROVED_BY")]
+ public string ApprovedBy { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "APPROVED_DATE")]
+ public DateTime? ApprovedDate { get; set; }
+
+ /// <summary>
+ /// 浣滃簾鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "CANCEL_STATUS")]
+ public string CancelStatus { get; set; }
+
+ /// <summary>
+ /// 浣滃簾浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CANCELLED_BY")]
+ public string CancelledBy { get; set; }
+
+ /// <summary>
+ /// 浣滃簾鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CANCEL_DATE")]
+ public DateTime? CancelDate { get; set; }
+
+ /// <summary>
+ /// 鍏抽棴鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "CLOSE_STATUS")]
+ public string CloseStatus { get; set; }
+
+ /// <summary>
+ /// 鏄惁鎵嬪姩鍏抽棴
+ /// </summary>
+ [SugarColumn(ColumnName = "MANUAL_CLOSE_FLAG")]
+ public string ManualCloseFlag { get; set; }
+
+ /// <summary>
+ /// ERP澶碔D
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_ID")]
+ public string ErpId { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_STATUS")]
+ public string BillStatus { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Modes/SalesReturnNoticeDetail.cs b/MES.Service/Modes/SalesReturnNoticeDetail.cs
index cb50a1e..26c1c23 100644
--- a/MES.Service/Modes/SalesReturnNoticeDetail.cs
+++ b/MES.Service/Modes/SalesReturnNoticeDetail.cs
@@ -11,7 +11,8 @@
/// <summary>
/// SEQ_sales
/// </summary>
- [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales", IsPrimaryKey = true)]
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_sales",
+ IsPrimaryKey = true)]
public decimal Id { get; set; }
/// <summary>
@@ -165,9 +166,8 @@
public string? SalesOrder { get; set; }
/// <summary>
- /// 瀹㈡埛璁㈠崟鍙�
+ /// 瀹㈡埛璁㈠崟鍙�
/// </summary>
[SugarColumn(ColumnName = "CUST_ORDER")]
public string? CustOrder { get; set; }
-
}
\ No newline at end of file
diff --git a/MES.Service/Modes/SysDepartment.cs b/MES.Service/Modes/SysDepartment.cs
index 7b99287..a889f45 100644
--- a/MES.Service/Modes/SysDepartment.cs
+++ b/MES.Service/Modes/SysDepartment.cs
@@ -120,6 +120,7 @@
/// </summary>
[SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal Id { get; set; }
+
/// <summary>
/// 鍒涘缓缁勭粐
/// </summary>
diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
index 7669e20..86381d8 100644
--- a/MES.Service/Modes/Womcaa.cs
+++ b/MES.Service/Modes/Womcaa.cs
@@ -11,7 +11,8 @@
/// <summary>
/// 鑷鍒� SEQ_CAA
/// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,OracleSequenceName = "SEQ_CAA")]
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,
+ OracleSequenceName = "SEQ_CAA")]
public decimal? Id { get; set; }
/// <summary>
diff --git a/MES.Service/Modes/Womcab.cs b/MES.Service/Modes/Womcab.cs
index fa5c30b..46bb1fe 100644
--- a/MES.Service/Modes/Womcab.cs
+++ b/MES.Service/Modes/Womcab.cs
@@ -11,7 +11,8 @@
/// <summary>
/// 鑷鍒�
/// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,OracleSequenceName = "SEQ_CAB")]
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,
+ OracleSequenceName = "SEQ_CAB")]
public decimal? Id { get; set; }
/// <summary>
diff --git a/MES.Service/service/BasicData/MesCustomerManager.cs b/MES.Service/service/BasicData/MesCustomerManager.cs
index 6fef5bc..7eb51f3 100644
--- a/MES.Service/service/BasicData/MesCustomerManager.cs
+++ b/MES.Service/service/BasicData/MesCustomerManager.cs
@@ -55,11 +55,13 @@
switch (customerGroup.Key)
{
case "0":
- if (!UpdateCustomerStatusBatch(db, customerGroup.Value,"A"))
+ if (!UpdateCustomerStatusBatch(db, customerGroup.Value,
+ "A"))
throw new NotImplementedException("鍚敤澶辫触");
break;
case "1":
- if (!UpdateCustomerStatusBatch(db, customerGroup.Value,"B"))
+ if (!UpdateCustomerStatusBatch(db, customerGroup.Value,
+ "B"))
throw new NotImplementedException("绂佺敤澶辫触");
break;
case "2":
@@ -144,8 +146,8 @@
Fseller = customer.FSeller,
Fforbidstatus = customer.FForbidStatus,
CreateDate = DateTime.Now,
- CreateOrg= Convert.ToDecimal(customer.FCreateOrgId),
- UseOrg= Convert.ToDecimal(customer.FUseOrgId),
+ CreateOrg = Convert.ToDecimal(customer.FCreateOrgId),
+ UseOrg = Convert.ToDecimal(customer.FUseOrgId),
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs b/MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs
index d087bb8..636ca7b 100644
--- a/MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs
+++ b/MES.Service/service/BasicData/MesDeliveryNoteBarcodeManager.cs
@@ -1,5 +1,4 @@
-锘縰sing AngleSharp.Dom;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -23,9 +22,10 @@
return SaveOrUpdateData(db, mesDeliveryNoteBarcode) ? 1 : 0;
case "3":
case "6":
- return DeleteData(db, mesDeliveryNoteBarcode) ? 1: 0;
+ return DeleteData(db, mesDeliveryNoteBarcode) ? 1 : 0;
default:
- throw new ArgumentNullException($"type娌℃湁{barcode.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
+ throw new ArgumentNullException(
+ $"type娌℃湁{barcode.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
}
throw new NotImplementedException("鎿嶄綔澶辫触");
@@ -33,7 +33,8 @@
}
// 鏇存柊鏁版嵁鐨勬柟娉�
- private bool DeleteData(SqlSugarScope db, MesDeliveryNoteBarcode mesDeliveryNoteBarcode)
+ private bool DeleteData(SqlSugarScope db,
+ MesDeliveryNoteBarcode mesDeliveryNoteBarcode)
{
var detect = base.DeleteById(mesDeliveryNoteBarcode.Id);
@@ -44,12 +45,11 @@
// 鍒犻櫎鏁版嵁鐨勬柟娉�
private bool DeleteBarcode(SqlSugarScope db, DelBarcode barcode)
{
- var del = db.Deleteable<MesDeliveryNoteBarcode>().Where(s => s.SmallBarcode == barcode.SmallBarcode).ExecuteCommand() > 0;
+ var del = db.Deleteable<MesDeliveryNoteBarcode>()
+ .Where(s => s.SmallBarcode == barcode.SmallBarcode)
+ .ExecuteCommand() > 0;
- if (del)
- {
- return true;
- }
+ if (del) return true;
throw new NotImplementedException("鍒犻櫎澶辫触");
}
@@ -68,9 +68,11 @@
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
- private bool SaveOrUpdateData(SqlSugarScope db, MesDeliveryNoteBarcode mesDeliveryNoteBarcode)
+ private bool SaveOrUpdateData(SqlSugarScope db,
+ MesDeliveryNoteBarcode mesDeliveryNoteBarcode)
{
- if (mesDeliveryNoteBarcode.Id != null) base.DeleteById(mesDeliveryNoteBarcode.Id);
+ if (mesDeliveryNoteBarcode.Id != null)
+ base.DeleteById(mesDeliveryNoteBarcode.Id);
var orUpdate = base.Insert(mesDeliveryNoteBarcode);
if (orUpdate) return true;
@@ -88,20 +90,20 @@
public MesDeliveryNoteBarcode GetMesDeliveryNoteBarcode(ErpBarcode barcode)
{
var mesDeliveryNoteBarcode = new MesDeliveryNoteBarcode();
- var single = base.GetSingle(it => it.SmallBarcode == barcode.SmallBarcode);
+ var single =
+ base.GetSingle(it => it.SmallBarcode == barcode.SmallBarcode);
if (single != null) mesDeliveryNoteBarcode.Id = single.Id;
mesDeliveryNoteBarcode.DeliveryNo = barcode.DeliveryNo;
mesDeliveryNoteBarcode.ProductCode = barcode.ProductCode;
- mesDeliveryNoteBarcode.SmallBarcode= barcode.SmallBarcode;
- mesDeliveryNoteBarcode.IncludeQty= Convert.ToDecimal(barcode.IncludeQty);
- mesDeliveryNoteBarcode.LineNo=Convert.ToDecimal(barcode.LineNo);
+ mesDeliveryNoteBarcode.SmallBarcode = barcode.SmallBarcode;
+ mesDeliveryNoteBarcode.IncludeQty =
+ Convert.ToDecimal(barcode.IncludeQty);
+ mesDeliveryNoteBarcode.LineNo = Convert.ToDecimal(barcode.LineNo);
mesDeliveryNoteBarcode.CreateDate = DateTime.Now;
mesDeliveryNoteBarcode.SuppNo = barcode.SupplierId;
return mesDeliveryNoteBarcode;
}
-
-
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesDeliveryNoteManager.cs b/MES.Service/service/BasicData/MesDeliveryNoteManager.cs
index f8016d4..3d28066 100644
--- a/MES.Service/service/BasicData/MesDeliveryNoteManager.cs
+++ b/MES.Service/service/BasicData/MesDeliveryNoteManager.cs
@@ -2,20 +2,21 @@
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
-using System.Security.Cryptography;
namespace MES.Service.service.BasicData;
public class MesDeliveryNoteManager : Repository<MesDeliveryNote>
{
- private readonly MesDeliveryDetailsManager mesDeliveryNoteManager= new ();
+ private readonly MesDeliveryDetailsManager mesDeliveryNoteManager = new();
// Save 鏂规硶鐢ㄤ簬淇濆瓨鍗曚釜 RohIn 璁板綍锛屾牴鎹被鍨嬫墽琛屼笉鍚岀殑鎿嶄綔
public bool Save(Delivery delivery)
{
var erpDelivery = delivery.ErpDelivery;
var mesDeliveryNote = GetMesDeliveryNote(erpDelivery);
- var mesDeliveryNoteDetails = GetMesDeliveryNoteDetails(delivery.ErpDeliveryData, erpDelivery.DeliveryNo, mesDeliveryNote.Status);
+ var mesDeliveryNoteDetails = GetMesDeliveryNoteDetails(
+ delivery.ErpDeliveryData, erpDelivery.DeliveryNo,
+ mesDeliveryNote.Status);
return UseTransaction(db =>
{
@@ -24,10 +25,16 @@
case "2":
case "4":
case "5":
- return SaveOrUpdateData(db, mesDeliveryNote, mesDeliveryNoteDetails) ? 1 : 0;
+ return SaveOrUpdateData(db, mesDeliveryNote,
+ mesDeliveryNoteDetails)
+ ? 1
+ : 0;
case "3":
case "6":
- return DeleteData(db, mesDeliveryNote, mesDeliveryNoteDetails) ? 1: 0;
+ return DeleteData(db, mesDeliveryNote,
+ mesDeliveryNoteDetails)
+ ? 1
+ : 0;
default:
throw new NotImplementedException(
$"type娌℃湁{erpDelivery.Type}杩欎釜绫诲瀷");
@@ -37,26 +44,34 @@
// 鏇存柊鏁版嵁鐨勬柟娉�
- private bool DeleteData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
+ private bool DeleteData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,
+ List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
{
var decimals = mesDeliveryNoteDetails.Select(s => s.Id).ToArray();
var update = base.DeleteById(mesDeliveryNote.Id);
- var insertOrUpdate = db.Deleteable<MesDeliveryNoteDetails>().Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo).ExecuteCommand() > 0;
+ var insertOrUpdate = db.Deleteable<MesDeliveryNoteDetails>()
+ .Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo)
+ .ExecuteCommand() > 0;
if (update && insertOrUpdate) return true;
throw new NotImplementedException("鍒犻櫎澶辫触");
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
- private bool SaveOrUpdateData(SqlSugarScope db, MesDeliveryNote mesDeliveryNote,List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
+ private bool SaveOrUpdateData(SqlSugarScope db,
+ MesDeliveryNote mesDeliveryNote,
+ List<MesDeliveryNoteDetails> mesDeliveryNoteDetails)
{
if (mesDeliveryNote.Id != null) base.DeleteById(mesDeliveryNote.Id);
if (mesDeliveryNoteDetails.Count > 0)
- db.Deleteable<MesDeliveryNoteDetails>().Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo).ExecuteCommand();
+ db.Deleteable<MesDeliveryNoteDetails>()
+ .Where(s => s.DeliveryNo == mesDeliveryNote.DeliveryNo)
+ .ExecuteCommand();
var orUpdate = base.Insert(mesDeliveryNote);
- var baOrUpdate = mesDeliveryNoteManager.InsertRange(mesDeliveryNoteDetails);
+ var baOrUpdate =
+ mesDeliveryNoteManager.InsertRange(mesDeliveryNoteDetails);
if (orUpdate && baOrUpdate) return true;
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
@@ -86,15 +101,18 @@
}
else
{
- mesDeliveryNote.Status =0;
+ mesDeliveryNote.Status = 0;
}
+
mesDeliveryNote.CreateDate = DateTime.Now;
mesDeliveryNote.DepotNo = delivery.DepotNo;
mesDeliveryNote.ErpId = delivery.ErpId;
return mesDeliveryNote;
}
- public List<MesDeliveryNoteDetails> GetMesDeliveryNoteDetails(List<ErpDeliveryData> erpDeliveryDatas, string? type,decimal? status)
+
+ public List<MesDeliveryNoteDetails> GetMesDeliveryNoteDetails(
+ List<ErpDeliveryData> erpDeliveryDatas, string? type, decimal? status)
{
return erpDeliveryDatas.Select(s =>
{
@@ -116,8 +134,10 @@
Fsrcbill_no = s.SalesOrderId,
RealQty = Convert.ToDecimal(s.IncludeQty)
};
- var single = mesDeliveryNoteManager.GetSingle(it =>it.LineNo == entity.LineNo);
- if (single !=null && status==1) entity.RealQty = single.RealQty;
+ var single =
+ mesDeliveryNoteManager.GetSingle(it =>
+ it.LineNo == entity.LineNo);
+ if (single != null && status == 1) entity.RealQty = single.RealQty;
return entity;
}).ToList();
diff --git a/MES.Service/service/BasicData/MesDepotsManager.cs b/MES.Service/service/BasicData/MesDepotsManager.cs
index 3087d0b..627d045 100644
--- a/MES.Service/service/BasicData/MesDepotsManager.cs
+++ b/MES.Service/service/BasicData/MesDepotsManager.cs
@@ -109,8 +109,8 @@
Depottype = depots.FStockProperty,
IsNg = depots.FForbidStatus,
Zuid = depots.FGroup,
- CreateOrg= Convert.ToDecimal(depots.FCreateOrgId),
- UseOrg= Convert.ToDecimal(depots.FUseOrgId),
+ CreateOrg = Convert.ToDecimal(depots.FCreateOrgId),
+ UseOrg = Convert.ToDecimal(depots.FUseOrgId),
CreateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index f3ab3cf..8813567 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -143,7 +143,7 @@
return new MesItems
{
Id = Convert.ToDecimal(item.Id),
- ItemId= Convert.ToDecimal(item.Id),
+ ItemId = Convert.ToDecimal(item.Id),
ItemNo = item.FNumber,
ItemName = item.FName,
ItemModel = item.FSpecification,
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index 9b395ea..36d0646 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -12,7 +12,8 @@
{
var rohInErpRohIn = rohIn.ErpRohIn;
var mesRohIn = GetMesRohIn(rohInErpRohIn);
- var mesRohInDatas = GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type);
+ var mesRohInDatas =
+ GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type);
return UseTransaction(db =>
{
@@ -134,7 +135,7 @@
EbelnK3id = Convert.ToDecimal(s.id),
ErpId = Convert.ToDecimal(s.Eid),
BillNo = s.FBillNo,
- OrderLineId=s.FSeq,
+ OrderLineId = s.FSeq,
PurchaseOrderLineNumber = s.FSeq,
SalesOrderId = s.FXSHTH,
ItemId = s.FMaterialId,
@@ -161,7 +162,8 @@
TerminateTime = s.FTerminateDate != null ? DateTime.ParseExact(s.FTerminateDate,"yyyy-MM-dd HH:mm:ss", null) : null,
TotalReceivedQty = Convert.ToDecimal(s.FQty)-Convert.ToDecimal(s.FRemainReceiveQty),
RemainingReceivedQty = Convert.ToDecimal(s.FRemainReceiveQty),
- TotalStoredQty = Convert.ToDecimal(s.FQty) - Convert.ToDecimal(s.FRemainStockINQty),
+ TotalStoredQty = Convert.ToDecimal(s.FQty) -
+ Convert.ToDecimal(s.FRemainStockINQty),
RemainingStoredQty = Convert.ToDecimal(s.FRemainStockINQty),
TotalReturnedQty = Convert.ToDecimal(s.FMrbQty),
ReturnableReceivedQty = Convert.ToDecimal(s.Fcheckretqty),
diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index d0eb8b7..c92bcf4 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -42,14 +42,15 @@
}
// 鏇存柊鍛樺伐鐘舵�佺殑鏂规硶
- private bool UpdateStaffStatus(SqlSugarScope db, decimal staffId,string status)
+ private bool UpdateStaffStatus(SqlSugarScope db, decimal staffId,
+ string status)
{
var result = db.Updateable<MesStaff>().SetColumns(s => s.FforbidStatus == status).Where(s => s.Id == staffId).ExecuteCommand();
return true;
}
// 鎻掑叆鎴栨洿鏂板憳宸ョ殑鏂规硶
- private bool InsertOrUpdateStaff(SqlSugarScope db,MesStaff entity)
+ private bool InsertOrUpdateStaff(SqlSugarScope db, MesStaff entity)
{
var exists = db.Queryable<MesStaff>().Any(e => e.Id == entity.Id);
if (exists)
@@ -90,9 +91,8 @@
};
if (staff.FStaffStartDate != null)
- {
- entity.StartDate = DateTime.ParseExact(staff.FStaffStartDate, "yyyy-MM-dd HH:mm:ss", null);
- }
+ entity.StartDate = DateTime.ParseExact(staff.FStaffStartDate,
+ "yyyy-MM-dd HH:mm:ss", null);
return entity;
}
@@ -108,15 +108,17 @@
switch (staffGroup.Key)
{
case "0":
- if (!UpdateStaffStatusBatch(db, staffGroup.Value,"A")) // 鎵归噺鍚敤鍛樺伐
+ if (!UpdateStaffStatusBatch(db, staffGroup.Value,
+ "A")) // 鎵归噺鍚敤鍛樺伐
throw new NotImplementedException("鍚敤澶辫触");
break;
case "1":
- if (!UpdateStaffStatusBatch(db, staffGroup.Value,"B")) // 鎵归噺绂佺敤鍛樺伐
+ if (!UpdateStaffStatusBatch(db, staffGroup.Value,
+ "B")) // 鎵归噺绂佺敤鍛樺伐
throw new NotImplementedException("绂佺敤澶辫触");
break;
case "2":
- if (!InsertStaffBatch(db,staffGroup.Value)) // 鎵归噺鎻掑叆鍛樺伐
+ if (!InsertStaffBatch(db, staffGroup.Value)) // 鎵归噺鎻掑叆鍛樺伐
throw new NotImplementedException("鎻掑叆澶辫触");
break;
case "3":
@@ -124,11 +126,13 @@
throw new NotImplementedException("鍒犻櫎澶辫触");
break;
case "4":
- if (!InsertOrUpdateBatch(db,staffGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂板憳宸�
+ if (!InsertOrUpdateBatch(db,
+ staffGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂板憳宸�
throw new NotImplementedException("鍚屾澶辫触");
break;
default:
- throw new ArgumentNullException($"type娌℃湁{staffGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
+ throw new ArgumentNullException(
+ $"type娌℃湁{staffGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
}
return 1;
@@ -136,7 +140,8 @@
}
// 鎵归噺鏇存柊鍛樺伐鐘舵�佺殑鏂规硶
- private bool UpdateStaffStatusBatch(SqlSugarScope db,List<MesStaff> staffList, string status)
+ private bool UpdateStaffStatusBatch(SqlSugarScope db,
+ List<MesStaff> staffList, string status)
{
var ids = staffList.Select(it => it.Id).ToArray();
var result = db.Updateable<MesStaff>().SetColumns(s => s.FforbidStatus == status).Where(s => ids.Contains(s.Id)).ExecuteCommand();
@@ -145,7 +150,7 @@
}
// 鎵归噺鎻掑叆鍛樺伐鐨勬柟娉�
- private bool InsertStaffBatch(SqlSugarScope db,List<MesStaff> staffList)
+ private bool InsertStaffBatch(SqlSugarScope db, List<MesStaff> staffList)
{
foreach (var entity in staffList)
{
diff --git a/MES.Service/service/BasicData/MesSupplierManager.cs b/MES.Service/service/BasicData/MesSupplierManager.cs
index 649b8fd..0a859a3 100644
--- a/MES.Service/service/BasicData/MesSupplierManager.cs
+++ b/MES.Service/service/BasicData/MesSupplierManager.cs
@@ -144,9 +144,9 @@
Fstaffid = supplier.FStaffId,
Fforbidstatus = supplier.FForbidStatus,
CreateDate = DateTime.Now,
- CreateOrg= Convert.ToDecimal(supplier.FCreateOrgId),
- UseOrg= Convert.ToDecimal(supplier.FUseOrgId),
- Remark=supplier.FDescription,
+ CreateOrg = Convert.ToDecimal(supplier.FCreateOrgId),
+ UseOrg = Convert.ToDecimal(supplier.FUseOrgId),
+ Remark = supplier.FDescription,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/OrganizeManager.cs b/MES.Service/service/BasicData/OrganizeManager.cs
index 4af4abe..0aa7384 100644
--- a/MES.Service/service/BasicData/OrganizeManager.cs
+++ b/MES.Service/service/BasicData/OrganizeManager.cs
@@ -1,10 +1,7 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using MES.Service.DB;
-using MES.Service.Modes;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
-using System.Xml.Linq;
+using MES.Service.Modes;
+using SqlSugar;
namespace MES.Service.service;
diff --git a/MES.Service/service/BasicData/SalesDeliveryNoticeDetailManager.cs b/MES.Service/service/BasicData/SalesDeliveryNoticeDetailManager.cs
index d083dde..07492af 100644
--- a/MES.Service/service/BasicData/SalesDeliveryNoticeDetailManager.cs
+++ b/MES.Service/service/BasicData/SalesDeliveryNoticeDetailManager.cs
@@ -1,78 +1,80 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Modes;
+using SqlSugar;
-namespace MES.Service.service
+namespace MES.Service.service;
+
+public class
+ SalesDeliveryNoticeDetailManager : Repository<SalesDeliveryNoticeDetail>
{
-public class SalesDeliveryNoticeDetailManager : Repository<SalesDeliveryNoticeDetail>
-{
-
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
//杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 SalesDeliveryNoticeDetailManager.cs
#region 鏁欏鏂规硶
+
/// <summary>
- /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠ｇ爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
+ /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠ｇ爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
/// </summary>
public void Study()
{
-
- /*********鏌ヨ*********/
+ /*********鏌ヨ*********/
- var data1 = base.GetById(1);//鏍规嵁ID鏌ヨ
- var data2 = base.GetList();//鏌ヨ鎵�鏈�
- var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ
+ var 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 p = new PageModel { PageIndex = 1, PageSize = 2 }; // 鍒嗛〉鏌ヨ
var data5 = base.GetPageList(it => 1 == 1, p);
- Console.Write(p.TotalCount);//杩斿洖鎬绘暟
+ Console.Write(p.TotalCount); //杩斿洖鎬绘暟
- var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom(), OrderByType.Asc);// 鍒嗛〉鏌ヨ鍔犳帓搴�
- Console.Write(p.TotalCount);//杩斿洖鎬绘暟
-
- List<IConditionalModel> conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
- conModels.Add(new ConditionalModel() { FieldName= typeof(SalesDeliveryNoticeDetail).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1
- var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);
+ var data6 =
+ base.GetPageList(it => 1 == 1, p,
+ it => SqlFunc.GetRandom()); // 鍒嗛〉鏌ヨ鍔犳帓搴�
+ Console.Write(p.TotalCount); //杩斿洖鎬绘暟
- base.AsQueryable().Where(x => 1 == 1).ToList();//鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
+ var conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
+ conModels.Add(new ConditionalModel
+ {
+ FieldName = typeof(SalesDeliveryNoticeDetail).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 SalesDeliveryNoticeDetail() { };//娴嬭瘯鍙傛暟
- var insertArray = new SalesDeliveryNoticeDetail[] { insertData };
- base.Insert(insertData);//鎻掑叆
- base.InsertRange(insertArray);//鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData);//鎻掑叆杩斿洖鑷鍒�
- base.AsInsertable(insertData).ExecuteCommand();//鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
+ var insertData = new SalesDeliveryNoticeDetail(); //娴嬭瘯鍙傛暟
+ var insertArray = new[] { insertData };
+ base.Insert(insertData); //鎻掑叆
+ base.InsertRange(insertArray); //鎵归噺鎻掑叆
+ var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
+ AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
- /*********鏇存柊*********/
- var updateData = new SalesDeliveryNoticeDetail() { };//娴嬭瘯鍙傛暟
- var updateArray = new SalesDeliveryNoticeDetail[] { updateData };//娴嬭瘯鍙傛暟
- base.Update(updateData);//鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray);//鎵归噺鏇存柊
+ /*********鏇存柊*********/
+ var updateData = new SalesDeliveryNoticeDetail(); //娴嬭瘯鍙傛暟
+ var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
+ base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
+ base.UpdateRange(updateArray); //鎵归噺鏇存柊
//base.Update(it => new SalesDeliveryNoticeDetail() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- base.AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
+ AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
+ /*********鍒犻櫎*********/
+ var deldata = new SalesDeliveryNoticeDetail(); //娴嬭瘯鍙傛暟
+ base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
+ base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
+ base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
+ base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
+ AsDeleteable().Where(it => 1 == 2)
+ .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
+ }
- /*********鍒犻櫎*********/
- var deldata = new SalesDeliveryNoticeDetail() { };//娴嬭瘯鍙傛暟
- base.Delete(deldata);//鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1);//鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new int[] { 1,2});//鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it=>1==2);//鏍规嵁鏉′欢鍒犻櫎
- base.AsDeleteable().Where(it=>1==2).ExecuteCommand();//杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
#endregion
-
-
- }
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
index 95acca0..70d69b3 100644
--- a/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesDeliveryNoticeManager.cs
@@ -1,227 +1,219 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
+锘縰sing System.Globalization;
using MES.Service.DB;
-using MES.Service.Modes;
using MES.Service.Dto.webApi;
-using MES.Service.service.BasicData;
-using System.Globalization;
+using MES.Service.Modes;
+using SqlSugar;
-namespace MES.Service.service
+namespace MES.Service.service;
+
+public class SalesDeliveryNoticeManager : Repository<SalesDeliveryNotice>
{
- public class SalesDeliveryNoticeManager : Repository<SalesDeliveryNotice>
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ private readonly SalesDeliveryNoticeDetailManager
+ _SalesDeliveryDetailManager = new();
+
+ //ErpSalesRerurn
+ public bool Save(ErpSalesDelivery SalesDelivery)
{
+ var erpSalesDeliveryDto = SalesDelivery.OrderDto;
+ var mesSalesDelivery =
+ ConvertErpToSalesDelivery(SalesDelivery.OrderDto);
+ var mesSalesDeliveryDatas =
+ ConvertErpToSalesDeliveryDetail(SalesDelivery.Items);
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- private readonly SalesDeliveryNoticeDetailManager _SalesDeliveryDetailManager = new();
- //ErpSalesRerurn
- public bool Save(ErpSalesDelivery SalesDelivery)
+ return UseTransaction(db =>
{
- var erpSalesDeliveryDto = SalesDelivery.OrderDto;
- var mesSalesDelivery = ConvertErpToSalesDelivery(SalesDelivery.OrderDto);
- var mesSalesDeliveryDatas = ConvertErpToSalesDeliveryDetail(SalesDelivery.Items);
-
- return UseTransaction(db =>
+ switch (erpSalesDeliveryDto.Type)
{
- switch (erpSalesDeliveryDto.Type)
- {
- case "3":
- return DeleteData(db, mesSalesDelivery, mesSalesDeliveryDatas) ? 1 : 0;
- case "2":
- case "4":
- return SaveOrUpdateData(db, mesSalesDelivery, mesSalesDeliveryDatas, erpSalesDeliveryDto.Type) ? 1: 0;
- default:
- throw new NotImplementedException( $"type娌℃湁{erpSalesDeliveryDto.Type}杩欎釜绫诲瀷");
- }
- }) > 0;
- }
-
- private bool DeleteData(SqlSugarScope db, SalesDeliveryNotice mesSalesDelivery,List<SalesDeliveryNoticeDetail> mesSalesDeliveryDatas)
- {
- var decimals = mesSalesDeliveryDatas.Select(s => s.Id).ToArray();
- var update = base.DeleteById(mesSalesDelivery.Id);
- var insertOrUpdate = db.Deleteable<SalesDeliveryNoticeDetail>().In(decimals).ExecuteCommand() > 0;
-
- if (update && insertOrUpdate)
- {
- return true;
+ case "3":
+ return DeleteData(db, mesSalesDelivery,
+ mesSalesDeliveryDatas)
+ ? 1
+ : 0;
+ case "2":
+ case "4":
+ return SaveOrUpdateData(db, mesSalesDelivery,
+ mesSalesDeliveryDatas, erpSalesDeliveryDto.Type)
+ ? 1
+ : 0;
+ default:
+ throw new NotImplementedException(
+ $"type娌℃湁{erpSalesDeliveryDto.Type}杩欎釜绫诲瀷");
}
- throw new NotImplementedException("鏇存柊澶辫触");
+ }) > 0;
+ }
+
+ private bool DeleteData(SqlSugarScope db,
+ SalesDeliveryNotice mesSalesDelivery,
+ List<SalesDeliveryNoticeDetail> mesSalesDeliveryDatas)
+ {
+ var decimals = mesSalesDeliveryDatas.Select(s => s.Id).ToArray();
+ var update = base.DeleteById(mesSalesDelivery.Id);
+ var insertOrUpdate = db.Deleteable<SalesDeliveryNoticeDetail>()
+ .In(decimals).ExecuteCommand() > 0;
+
+ if (update && insertOrUpdate) return true;
+ throw new NotImplementedException("鏇存柊澶辫触");
+ }
+
+ // 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
+ private bool SaveOrUpdateData(SqlSugarScope db,
+ SalesDeliveryNotice mesSalesDelivery,
+ List<SalesDeliveryNoticeDetail> mesSalesDeliveryDatas, string type)
+ {
+ if (mesSalesDelivery.Id != null) base.DeleteById(mesSalesDelivery.Id);
+ if (mesSalesDeliveryDatas.Count > 0)
+ db.Deleteable<SalesDeliveryNoticeDetail>()
+ .Where(s => s.ErpHeadId == mesSalesDelivery.ErpId)
+ .ExecuteCommand();
+ var orUpdate = base.Insert(mesSalesDelivery);
+ var baOrUpdate =
+ _SalesDeliveryDetailManager.InsertRange(mesSalesDeliveryDatas);
+ if (orUpdate && baOrUpdate) return true;
+
+
+ throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
+ }
+
+ // 鎵归噺淇濆瓨璁板綍鐨勬柟娉�
+ public bool SaveList(List<ErpSalesDelivery> salesOrder)
+ {
+ var result = salesOrder.Select(Save).ToList();
+ return result.All(b => b);
+ }
+
+ private SalesDeliveryNotice ConvertErpToSalesDelivery(
+ ErpSalesDeliveryDto erpDto)
+ {
+ DateTime parsedDate;
+
+ // 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
+ DateTime? ParseDateTime(string dateStr)
+ {
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
+ CultureInfo.InvariantCulture, DateTimeStyles.None,
+ out parsedDate)) return parsedDate;
+
+ return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
- // 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
- private bool SaveOrUpdateData(SqlSugarScope db, SalesDeliveryNotice mesSalesDelivery,List<SalesDeliveryNoticeDetail> mesSalesDeliveryDatas, string type)
+ var salesOrder = new SalesDeliveryNotice
{
- if (mesSalesDelivery.Id != null)
- {
- base.DeleteById(mesSalesDelivery.Id);
- }
- if (mesSalesDeliveryDatas.Count > 0)
- {
- db.Deleteable<SalesDeliveryNoticeDetail>().Where(s => s.ErpHeadId == mesSalesDelivery.ErpId).ExecuteCommand();
- }
- var orUpdate = base.Insert(mesSalesDelivery);
- var baOrUpdate = _SalesDeliveryDetailManager.InsertRange(mesSalesDeliveryDatas);
- if (orUpdate && baOrUpdate)
- {
- return true;
- }
+ BillNo = erpDto.FBillNo,
+ ErpId = erpDto.ErpID,
+ FDate = ParseDateTime(erpDto.FDate) ?? null,
+ BillType = erpDto.FBillTypeID, // 鍗曟嵁绫诲瀷
+ Currency = erpDto.FSettleCurrld, // 缁撶畻甯佸埆
+ SalesDept = erpDto.FSaleDeptId, //閿�鍞儴闂�
+ Customer = erpDto.FCustomerID, // 瀹㈡埛
+ DeliveryMethod = erpDto.FHeadDeliveryWay, // 浜よ揣鏂瑰紡
+ DeliveryLocation = erpDto.FHeadLocId, // 浜よ揣鍦扮偣
+ Carrier = erpDto.FCarrierID, // 鎵胯繍鍟�
+ TransportNo = erpDto.FCarriageNO, // 杩愯緭鍗曞彿
+ BillNoType = erpDto.FCarriageNO, // 鍗曟嵁鐘舵��
+ DeliveryDept = erpDto.FDeliveryDeptID, // 鍙戣揣閮ㄩ棬
+ InventoryGroup = erpDto.FStockerGroupId, // 搴撳瓨缁�
+ WarehouseManager = erpDto.FStockerId, // 浠撶鍛�
+ SalesGroup = erpDto.FSaleGroupId, // 閿�鍞粍
+ SalesPerson = erpDto.FSalesManId, //閿�鍞憳
+ Receiver = erpDto.FReceiveCusId, // 鏀惰揣鏂�
+ ReceiverContact = erpDto.FReceiveCusContact, // 鏀惰揣鏂硅仈绯讳汉
+ ReceiverAddress = erpDto.FReceiveAddress, // 鏀惰揣鏂瑰湴鍧�
+ ReceiverName = erpDto.FLinkMan, // 鏀惰揣鏂瑰鍚�
+ LinkPhone = erpDto.FLinkPhone, //鑱旂郴鐢佃瘽
+ SettleParty = erpDto.FSettleID, // 缁撶畻鏂�
+ PayerParty = erpDto.FPayerID, //浠樻鏂�
+ CreatedBy = erpDto.FCreatorId, // 鍒涘缓浜�
+ CreatedDate = ParseDateTime(erpDto.FCreateDate) ?? null, // 鍒涘缓鏃堕棿
+ ModifiedBy = erpDto.FModifierId, // 淇敼浜�
+ ModifiedDate = ParseDateTime(erpDto.FModifyDate) ?? null, // 淇敼鏃堕棿
+ ClosedBy = erpDto.FCloserId, // 鍏抽棴浜�
+ CloseReason = erpDto.FCloseReason, // 鍏抽棴鍘熷洜
+ // CloseDate = ParseDateTime(erpDto.FCloseDate) ?? null, // 鍏抽棴鏃ユ湡
+ ApprovedBy = erpDto.FApproverId, // 瀹℃牳浜�
+ ApprovedDate = ParseDateTime(erpDto.FApproveDate) ?? null, // 瀹℃牳鏃ユ湡
+ CancelStatus = erpDto.FCancelStatus, // 浣滃簾鐘舵��
+ CancelledBy = erpDto.FCancellerId, // 浣滃簾浜�
+ CancelDate = ParseDateTime(erpDto.FCancelDate) ?? null, // 浣滃簾鏃ユ湡
+ CloseStatus = erpDto.FBillCloseStatus, // 鍏抽棴鐘舵��
+ BillStatus = erpDto.FDocumentStatus //鍗曟嵁鐘舵��
+ };
+ var single = base.GetSingle(it => it.ErpId == erpDto.ErpID);
+ if (single != null) salesOrder.Id = single.Id;
- throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
+ return salesOrder;
+ }
+
+ private List<SalesDeliveryNoticeDetail> ConvertErpToSalesDeliveryDetail(
+ List<ErpSalesDeliveryDetailDto> erpDtoList)
+
+ {
+ var salesOrderSubList = new List<SalesDeliveryNoticeDetail>();
+ DateTime parsedDate;
+
+ // 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
+ DateTime? ParseDateTime(string dateStr)
+ {
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
+ CultureInfo.InvariantCulture, DateTimeStyles.None,
+ out parsedDate)) return parsedDate;
+ return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
- // 鎵归噺淇濆瓨璁板綍鐨勬柟娉�
- public bool SaveList(List<ErpSalesDelivery> salesOrder)
+
+ foreach (var erpDto in erpDtoList)
{
- var result = salesOrder.Select(Save).ToList();
- return result.All(b => b);
- }
-
- private SalesDeliveryNotice ConvertErpToSalesDelivery(ErpSalesDeliveryDto erpDto)
- {
- DateTime parsedDate;
-
- // 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
- DateTime? ParseDateTime(string dateStr)
+ var salesOrderSub = new SalesDeliveryNoticeDetail
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",CultureInfo.InvariantCulture,DateTimeStyles.None, out parsedDate))
- {
- return parsedDate;
- }
-
- return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
- }
-
- var salesOrder = new SalesDeliveryNotice
- {
- BillNo = erpDto.FBillNo,
- ErpId = erpDto.ErpID,
- FDate = ParseDateTime(erpDto.FDate) ?? null,
- BillType = erpDto.FBillTypeID, // 鍗曟嵁绫诲瀷
- Currency = erpDto.FSettleCurrld, // 缁撶畻甯佸埆
- SalesDept = erpDto.FSaleDeptId, //閿�鍞儴闂�
- Customer = erpDto.FCustomerID, // 瀹㈡埛
- DeliveryMethod = erpDto.FHeadDeliveryWay, // 浜よ揣鏂瑰紡
- DeliveryLocation = erpDto.FHeadLocId, // 浜よ揣鍦扮偣
- Carrier = erpDto.FCarrierID, // 鎵胯繍鍟�
- TransportNo = erpDto.FCarriageNO, // 杩愯緭鍗曞彿
- BillNoType = erpDto.FCarriageNO, // 鍗曟嵁鐘舵��
- DeliveryDept = erpDto.FDeliveryDeptID, // 鍙戣揣閮ㄩ棬
- InventoryGroup = erpDto.FStockerGroupId, // 搴撳瓨缁�
- WarehouseManager = erpDto.FStockerId, // 浠撶鍛�
- SalesGroup = erpDto.FSaleGroupId, // 閿�鍞粍
- SalesPerson = erpDto.FSalesManId,//閿�鍞憳
- Receiver = erpDto.FReceiveCusId, // 鏀惰揣鏂�
- ReceiverContact = erpDto.FReceiveCusContact, // 鏀惰揣鏂硅仈绯讳汉
- ReceiverAddress = erpDto.FReceiveAddress, // 鏀惰揣鏂瑰湴鍧�
- ReceiverName = erpDto.FLinkMan, // 鏀惰揣鏂瑰鍚�
- LinkPhone = erpDto.FLinkPhone,//鑱旂郴鐢佃瘽
- SettleParty = erpDto.FSettleID, // 缁撶畻鏂�
- PayerParty = erpDto.FPayerID,//浠樻鏂�
- CreatedBy = erpDto.FCreatorId, // 鍒涘缓浜�
- CreatedDate = ParseDateTime(erpDto.FCreateDate) ?? null, // 鍒涘缓鏃堕棿
- ModifiedBy = erpDto.FModifierId, // 淇敼浜�
- ModifiedDate = ParseDateTime(erpDto.FModifyDate) ?? null, // 淇敼鏃堕棿
- ClosedBy = erpDto.FCloserId, // 鍏抽棴浜�
- CloseReason = erpDto.FCloseReason, // 鍏抽棴鍘熷洜
- // CloseDate = ParseDateTime(erpDto.FCloseDate) ?? null, // 鍏抽棴鏃ユ湡
- ApprovedBy = erpDto.FApproverId, // 瀹℃牳浜�
- ApprovedDate = ParseDateTime(erpDto.FApproveDate) ?? null, // 瀹℃牳鏃ユ湡
- CancelStatus = erpDto.FCancelStatus, // 浣滃簾鐘舵��
- CancelledBy = erpDto.FCancellerId, // 浣滃簾浜�
- CancelDate = ParseDateTime(erpDto.FCancelDate) ?? null, // 浣滃簾鏃ユ湡
- CloseStatus = erpDto.FBillCloseStatus, // 鍏抽棴鐘舵��
- BillStatus = erpDto.FDocumentStatus //鍗曟嵁鐘舵��
-
+ ErpLineId = erpDto.ErpID, //ERP琛孖D
+ ErpHeadId = erpDto.EHID, //ERP澶碔D
+ MaterialId = erpDto.FMaterialId, //鐗╂枡缂栧彿
+ SalesUnitId = erpDto.FUnitID, //閿�鍞崟浣�
+ SalesQuantity = Convert.ToDecimal(erpDto.FQty), //閿�鍞暟閲�
+ IsFree = Convert.ToDecimal(erpDto.FIsFree), //鏄惁璧犲搧
+ DeliveryDate = ParseDateTime(erpDto.FDeliverydate), //瑕佽揣鏃ユ湡
+ Warehouse = erpDto.FStockId, //鍑鸿揣浠撳簱
+ PlanTrackingNumber = erpDto.FMtoNo, //璁″垝璺熻釜鍙�
+ LotNumber = erpDto.FLot, //鎵瑰彿
+ SrcBillNo = erpDto.FSrcBillNo, //婧愬崟缂栧彿
+ PriceQty = erpDto.FPriceUnitQty, //璁′环鏁伴噺
+ OwnerId = erpDto.FOwnerIdHead, //璐т富
+ InventoryUnit = erpDto.FStockUnitID, //搴撳瓨鍗曚綅
+ InventoryQuantity = Convert.ToDecimal(erpDto.FStockQty), //搴撳瓨鏁伴噺
+ PlanDeliveryDate =
+ ParseDateTime(erpDto.FPlanDeliveryDate), //璁″垝鍙戣揣鏃ユ湡
+ OutLmtUnit = erpDto.FOutLmtUnit, //瓒呭彂鎺у埗鍗曚綅
+ OutMaxQty = erpDto.FOutMaxQty, //鍑哄簱涓婇檺
+ OutMinQty = erpDto.FOutMinQty, //鍑哄簱涓嬮檺
+ DeliveryLoc = erpDto.FDeliveryLoc, //浜よ揣鍦扮偣
+ DeliverylAddress = erpDto.FDeliveryLAddress, //浜よ揣鍦板潃
+ SourceBillNo = erpDto.FSrcBillNo, //鍘熷崟鍗曞彿
+ OrderBillNo = erpDto.FOrderNo, //璁㈠崟鍗曞彿
+ TerminationStatus = erpDto.FTerminationStatus, //缁堟鐘舵��
+ TerminationDate = ParseDateTime(erpDto.FTerminateDate), //涓氬姟缁堟鏃ユ湡
+ SumOutQty = erpDto.FSumOutQty, //绱鍑哄簱鏁伴噺
+ RemainOutQty = erpDto.FRemainOutQty, //鏈嚭搴撴暟閲�
+ SalesOrder = erpDto.FXSHTH, //閿�鍞鍗曞彿
+ CustOrder = erpDto.F_ZJXF_TEXT_QTR_LEE, //瀹㈡埛璁㈠崟鍙�
+ SalesContractNo = erpDto.FXSHTBH, //閿�鍞悎鍚岀紪鍙�
+ F_KHWLBM = erpDto.F_KHWLBM,
+ F_KHWLMC = erpDto.F_KHWLMC
};
- var single = base.GetSingle(it => it.ErpId == erpDto.ErpID);
- if (single != null)
- {
- salesOrder.Id = single.Id;
- }
+ if (erpDto.FRemainOutQty == 0)
+ salesOrderSub.IsFinish = 1;
+ else
+ salesOrderSub.IsFinish = 0;
- return salesOrder;
+ var single = _SalesDeliveryDetailManager.GetSingle(it =>
+ it.ErpLineId == salesOrderSub.ErpLineId);
+ if (single != null) salesOrderSub.Id = single.Id;
+
+ salesOrderSubList.Add(salesOrderSub);
}
- private List<SalesDeliveryNoticeDetail> ConvertErpToSalesDeliveryDetail(List<ErpSalesDeliveryDetailDto> erpDtoList)
-
- {
- var salesOrderSubList = new List<SalesDeliveryNoticeDetail>();
- DateTime parsedDate;
- // 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
- DateTime? ParseDateTime(string dateStr)
- {
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",CultureInfo.InvariantCulture,DateTimeStyles.None,out parsedDate))
- {
- return parsedDate;
- }
- return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
- }
-
-
-
- foreach (var erpDto in erpDtoList)
- {
- var salesOrderSub = new SalesDeliveryNoticeDetail
- {
- ErpLineId = erpDto.ErpID,//ERP琛孖D
- ErpHeadId = erpDto.EHID,//ERP澶碔D
- MaterialId = erpDto.FMaterialId,//鐗╂枡缂栧彿
- SalesUnitId = erpDto.FUnitID,//閿�鍞崟浣�
- SalesQuantity = Convert.ToDecimal(erpDto.FQty),//閿�鍞暟閲�
- IsFree = Convert.ToDecimal(erpDto.FIsFree),//鏄惁璧犲搧
- DeliveryDate = ParseDateTime(erpDto.FDeliverydate),//瑕佽揣鏃ユ湡
- Warehouse = erpDto.FStockId,//鍑鸿揣浠撳簱
- PlanTrackingNumber = erpDto.FMtoNo,//璁″垝璺熻釜鍙�
- LotNumber = erpDto.FLot,//鎵瑰彿
- SrcBillNo = erpDto.FSrcBillNo,//婧愬崟缂栧彿
- PriceQty = erpDto.FPriceUnitQty,//璁′环鏁伴噺
- OwnerId = erpDto.FOwnerIdHead,//璐т富
- InventoryUnit = erpDto.FStockUnitID,//搴撳瓨鍗曚綅
- InventoryQuantity = Convert.ToDecimal(erpDto.FStockQty),//搴撳瓨鏁伴噺
- PlanDeliveryDate = ParseDateTime(erpDto.FPlanDeliveryDate),//璁″垝鍙戣揣鏃ユ湡
- OutLmtUnit = erpDto.FOutLmtUnit,//瓒呭彂鎺у埗鍗曚綅
- OutMaxQty = erpDto.FOutMaxQty,//鍑哄簱涓婇檺
- OutMinQty = erpDto.FOutMinQty,//鍑哄簱涓嬮檺
- DeliveryLoc = erpDto.FDeliveryLoc,//浜よ揣鍦扮偣
- DeliverylAddress = erpDto.FDeliveryLAddress,//浜よ揣鍦板潃
- SourceBillNo = erpDto.FSrcBillNo,//鍘熷崟鍗曞彿
- OrderBillNo = erpDto.FOrderNo,//璁㈠崟鍗曞彿
- TerminationStatus = erpDto.FTerminationStatus,//缁堟鐘舵��
- TerminationDate = ParseDateTime(erpDto.FTerminateDate),//涓氬姟缁堟鏃ユ湡
- SumOutQty = erpDto.FSumOutQty,//绱鍑哄簱鏁伴噺
- RemainOutQty = erpDto.FRemainOutQty,//鏈嚭搴撴暟閲�
- SalesOrder = erpDto.FXSHTH,//閿�鍞鍗曞彿
- CustOrder = erpDto.F_ZJXF_TEXT_QTR_LEE,//瀹㈡埛璁㈠崟鍙�
- SalesContractNo = erpDto.FXSHTBH,//閿�鍞悎鍚岀紪鍙�
- F_KHWLBM=erpDto.F_KHWLBM,
- F_KHWLMC=erpDto.F_KHWLMC,
-
- };
-
- if (erpDto.FRemainOutQty==0)
- {
- salesOrderSub.IsFinish = 1;
- }
- else
- {
- salesOrderSub.IsFinish = 0;
- }
-
- var single = _SalesDeliveryDetailManager.GetSingle(it =>it.ErpLineId == salesOrderSub.ErpLineId);
- if (single != null)
- {
- salesOrderSub.Id = single.Id;
- }
-
- salesOrderSubList.Add(salesOrderSub);
- }
-
- return salesOrderSubList;
- }
-
+ return salesOrderSubList;
}
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/SalesOrderManager.cs b/MES.Service/service/BasicData/SalesOrderManager.cs
index e009c81..31a57ba 100644
--- a/MES.Service/service/BasicData/SalesOrderManager.cs
+++ b/MES.Service/service/BasicData/SalesOrderManager.cs
@@ -1,6 +1,5 @@
-锘縰sing MES.Service.DB;
-using System.Data;
-using System.Globalization;
+锘縰sing System.Globalization;
+using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -12,6 +11,7 @@
//褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
private readonly SalesOrderDetailManager _SalesOrderDetailManager = new();
+
//ErpSalesOrder
public bool Save(ErpSalesOrder SalesOrder)
{
@@ -24,49 +24,49 @@
switch (erpSalesOrderDto.Type)
{
case "3":
- return DeleteData(db, mesSalesOrder, mesSalesOrderDatas) ? 1 : 0;
+ return DeleteData(db, mesSalesOrder, mesSalesOrderDatas)
+ ? 1
+ : 0;
case "2":
case "4":
case "5":
- return SaveOrUpdateData(db, mesSalesOrder, mesSalesOrderDatas, erpSalesOrderDto.Type) ? 1: 0;
+ return SaveOrUpdateData(db, mesSalesOrder,
+ mesSalesOrderDatas, erpSalesOrderDto.Type)
+ ? 1
+ : 0;
default:
- throw new NotImplementedException( $"type娌℃湁{erpSalesOrderDto.Type}杩欎釜绫诲瀷");
+ throw new NotImplementedException(
+ $"type娌℃湁{erpSalesOrderDto.Type}杩欎釜绫诲瀷");
}
}) > 0;
}
- private bool DeleteData(SqlSugarScope db, SalesOrder mesSalesOrder,List<SalesOrderDetail> mesSalesOrderDatas)
+ private bool DeleteData(SqlSugarScope db, SalesOrder mesSalesOrder,
+ List<SalesOrderDetail> mesSalesOrderDatas)
{
var decimals = mesSalesOrderDatas.Select(s => s.Id).ToArray();
var update = base.DeleteById(mesSalesOrder.Id);
- var insertOrUpdate = db.Deleteable<SalesOrderDetail>().In(decimals).ExecuteCommand() > 0;
+ var insertOrUpdate = db.Deleteable<SalesOrderDetail>().In(decimals)
+ .ExecuteCommand() > 0;
- if (update && insertOrUpdate)
- {
- return true;
- }
+ if (update && insertOrUpdate) return true;
throw new NotImplementedException("鏇存柊澶辫触");
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
- private bool SaveOrUpdateData(SqlSugarScope db, SalesOrder mesSalesOrder,List<SalesOrderDetail> mesSalesOrderDatas,string type)
+ private bool SaveOrUpdateData(SqlSugarScope db, SalesOrder mesSalesOrder,
+ List<SalesOrderDetail> mesSalesOrderDatas, string type)
{
- if (mesSalesOrder.Id != null)
- {
- base.DeleteById(mesSalesOrder.Id);
- }
+ if (mesSalesOrder.Id != null) base.DeleteById(mesSalesOrder.Id);
if (mesSalesOrderDatas.Count > 0)
- {
- db.Deleteable<SalesOrderDetail>().Where(s => s.EHID == mesSalesOrder.ErpID).ExecuteCommand();
- }
+ db.Deleteable<SalesOrderDetail>()
+ .Where(s => s.EHID == mesSalesOrder.ErpID).ExecuteCommand();
var orUpdate = base.Insert(mesSalesOrder);
- var baOrUpdate = _SalesOrderDetailManager.InsertRange(mesSalesOrderDatas);
- if (orUpdate && baOrUpdate)
- {
- return true;
- }
+ var baOrUpdate =
+ _SalesOrderDetailManager.InsertRange(mesSalesOrderDatas);
+ if (orUpdate && baOrUpdate) return true;
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
@@ -85,10 +85,9 @@
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.None,out parsedDate))
- {
- return parsedDate;
- }
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
+ CultureInfo.InvariantCulture, DateTimeStyles.None,
+ out parsedDate)) return parsedDate;
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
@@ -127,16 +126,15 @@
EntryNote = erpDto.FEntryNote // 澶囨敞
};
- var single = base.GetSingle(it => it.ErpID == Convert.ToDecimal(erpDto.ErpID));
- if (single != null)
- {
- salesOrder.Id = single.Id;
- }
+ var single =
+ base.GetSingle(it => it.ErpID == Convert.ToDecimal(erpDto.ErpID));
+ if (single != null) salesOrder.Id = single.Id;
return salesOrder;
}
- private List<SalesOrderDetail> ConvertErpToSalesOrderDetail(List<ErpSalesOrderDetailDto> erpDtoList)
+ private List<SalesOrderDetail> ConvertErpToSalesOrderDetail(
+ List<ErpSalesOrderDetailDto> erpDtoList)
{
var salesOrderSubList = new List<SalesOrderDetail>();
@@ -174,7 +172,7 @@
BaseRemainOutQty = Convert.ToDecimal(erpDto.FBaseRemainOutQty),
BASEARQTY = Convert.ToDecimal(erpDto.FBASEARQTY),
SalesOrder = erpDto.FXSHTH,
- CustOrder = erpDto.F_ZJXF_TEXT_QTR_LEE,
+ CustOrder = erpDto.F_ZJXF_TEXT_QTR_LEE,
SalesContractNo = erpDto.FXSHTBH,
ItemNo = erpDto.F_KHWLBM,
ItemName = erpDto.F_KHWLMC,
@@ -182,14 +180,11 @@
ArrivalDate = Convert.ToDateTime(erpDto.F_ZJXF_CGDHRQ),
ItemModel = erpDto.F_ZJXF_KHGGXH,
Ddly = erpDto.F_ZJXF_DDLY
-
};
- var single = _SalesOrderDetailManager.GetSingle(it =>it.ErpID == Convert.ToDecimal(salesOrderSub.ErpID));
- if (single != null)
- {
- salesOrderSub.Id = single.Id;
- }
+ var single = _SalesOrderDetailManager.GetSingle(it =>
+ it.ErpID == Convert.ToDecimal(salesOrderSub.ErpID));
+ if (single != null) salesOrderSub.Id = single.Id;
salesOrderSubList.Add(salesOrderSub);
}
diff --git a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs b/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
index e7b730d..bb891dd 100644
--- a/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
+++ b/MES.Service/service/BasicData/SalesReturnNoticeManager.cs
@@ -1,10 +1,8 @@
-锘縰sing MES.Service.DB;
-using System.Data;
-using System.Globalization;
+锘縰sing System.Globalization;
+using MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
-using DbType = System.Data.DbType;
namespace MES.Service.service.BasicData;
@@ -14,22 +12,29 @@
private readonly SalesReturnDetailManager _SalesReturnDetailManager =
new();
+
//ErpSalesRerurn
public bool Save(ErpSalesRerurn SalesReturn)
{
var erpSalesReturnDto = SalesReturn.OrderDto;
var mesSalesReturn = ConvertErpToSalesReturn(SalesReturn.OrderDto);
- var mesSalesReturnDatas = ConvertErpToSalesReturnDetail(SalesReturn.Items);
+ var mesSalesReturnDatas =
+ ConvertErpToSalesReturnDetail(SalesReturn.Items);
return UseTransaction(db =>
{
switch (erpSalesReturnDto.Type)
{
case "3":
- return UpdateData(db, mesSalesReturn, mesSalesReturnDatas) ? 1 : 0;
+ return UpdateData(db, mesSalesReturn, mesSalesReturnDatas)
+ ? 1
+ : 0;
case "2":
case "4":
- return SaveOrUpdateData(db, mesSalesReturn, mesSalesReturnDatas, erpSalesReturnDto.Type) ? 1: 0;
+ return SaveOrUpdateData(db, mesSalesReturn,
+ mesSalesReturnDatas, erpSalesReturnDto.Type)
+ ? 1
+ : 0;
default:
throw new NotImplementedException(
$"type娌℃湁{erpSalesReturnDto.Type}杩欎釜绫诲瀷");
@@ -37,39 +42,35 @@
}) > 0;
}
- private bool UpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,List<SalesReturnNoticeDetail> mesSalesReturnDatas)
+ private bool UpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,
+ List<SalesReturnNoticeDetail> mesSalesReturnDatas)
{
var decimals = mesSalesReturnDatas.Select(s => s.Id).ToArray();
var update = base.DeleteById(mesSalesReturn.Id);
- var insertOrUpdate = db.Deleteable<SalesReturnNoticeDetail>().In(decimals).ExecuteCommand() > 0;
+ var insertOrUpdate = db.Deleteable<SalesReturnNoticeDetail>()
+ .In(decimals).ExecuteCommand() > 0;
- if (update && insertOrUpdate)
- {
- return true;
- }
+ if (update && insertOrUpdate) return true;
throw new NotImplementedException("鏇存柊澶辫触");
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
- private bool SaveOrUpdateData(SqlSugarScope db, SalesReturnNotice mesSalesReturn,List<SalesReturnNoticeDetail> mesSalesReturnDatas,string type)
+ private bool SaveOrUpdateData(SqlSugarScope db,
+ SalesReturnNotice mesSalesReturn,
+ List<SalesReturnNoticeDetail> mesSalesReturnDatas, string type)
{
- if (mesSalesReturn.Id != null)
- {
- base.DeleteById(mesSalesReturn.Id);
- }
+ if (mesSalesReturn.Id != null) base.DeleteById(mesSalesReturn.Id);
if (mesSalesReturnDatas.Count > 0)
- {
- db.Deleteable<SalesReturnNoticeDetail>().Where(s => s.ErpHeadId == mesSalesReturn.ErpId).ExecuteCommand();
- }
+ db.Deleteable<SalesReturnNoticeDetail>()
+ .Where(s => s.ErpHeadId == mesSalesReturn.ErpId)
+ .ExecuteCommand();
var orUpdate = base.Insert(mesSalesReturn);
- var baOrUpdate = _SalesReturnDetailManager.InsertRange(mesSalesReturnDatas);
- if (orUpdate && baOrUpdate)
- {
- return true;
- }
-
+ var baOrUpdate =
+ _SalesReturnDetailManager.InsertRange(mesSalesReturnDatas);
+ if (orUpdate && baOrUpdate) return true;
+
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
@@ -88,10 +89,9 @@
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",CultureInfo.InvariantCulture,DateTimeStyles.None,out parsedDate))
- {
- return parsedDate;
- }
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
+ CultureInfo.InvariantCulture, DateTimeStyles.None,
+ out parsedDate)) return parsedDate;
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
@@ -110,7 +110,7 @@
InventoryGroup = erpDto.FStockerGroupId, // 搴撳瓨缁�
WarehouseManager = erpDto.FStockerId, // 浠撶鍛�
SalesGroup = erpDto.FSaleGroupId, // 閿�鍞粍
- SalesPerson = erpDto.FSalesManId,//閿�鍞憳
+ SalesPerson = erpDto.FSalesManId, //閿�鍞憳
Receiver = erpDto.FReceiveCusId, // 鏀惰揣鏂�
ReceiverContact = erpDto.FReceiveCusContact, // 鏀惰揣鏂硅仈绯讳汉
ReceiverAddress = erpDto.FReceiveAddress, // 鏀惰揣鏂瑰湴鍧�
@@ -129,81 +129,72 @@
CancelledBy = erpDto.FCancellerId, // 浣滃簾浜�
CancelDate = ParseDateTime(erpDto.FCancelDate) ?? null, // 浣滃簾鏃ユ湡
CloseStatus = erpDto.FBillCloseStatus, // 鍏抽棴鐘舵��
- BillStatus = erpDto.FDocumentStatus //鍗曟嵁鐘舵��
-
+ BillStatus = erpDto.FDocumentStatus //鍗曟嵁鐘舵��
};
var single = base.GetSingle(it => it.ErpId == erpDto.ErpID);
- if (single != null)
- {
- salesOrder.Id = single.Id;
- }
+ if (single != null) salesOrder.Id = single.Id;
return salesOrder;
}
- private List<SalesReturnNoticeDetail> ConvertErpToSalesReturnDetail(List<ErpSalesReturnDetailDto> erpDtoList)
-
+ private List<SalesReturnNoticeDetail> ConvertErpToSalesReturnDetail(
+ List<ErpSalesReturnDetailDto> erpDtoList)
+
{
var salesOrderSubList = new List<SalesReturnNoticeDetail>();
DateTime parsedDate;
+
// 鏃堕棿鏍煎紡杞崲鍑芥暟锛孍RP鏃堕棿鏍煎紡涓� "yyyy-MM-dd HH:mm:ss"
DateTime? ParseDateTime(string dateStr)
{
- if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",CultureInfo.InvariantCulture,DateTimeStyles.None,out parsedDate))
- {
- return parsedDate;
- }
-
+ if (DateTime.TryParseExact(dateStr, "yyyy-MM-dd HH:mm:ss",
+ CultureInfo.InvariantCulture, DateTimeStyles.None,
+ out parsedDate)) return parsedDate;
+
return null; // 濡傛灉杞崲澶辫触锛岃繑鍥瀗ull
}
-
foreach (var erpDto in erpDtoList)
{
var salesOrderSub = new SalesReturnNoticeDetail
{
- ErpLineId = erpDto.ErpID,//ERP琛孖D
- ErpHeadId = erpDto.EHID,//ERP澶碔D
- MaterialId = erpDto.FMaterialId,//鐗╂枡缂栧彿
- MaterialName = erpDto.FMaterialName,// 鐗╂枡鍚嶇О
- MaterialSpecification = erpDto.FMaterialModel,//瑙勬牸鍨嬪彿
- SalesUnitId = erpDto.FUnitID,//閿�鍞崟浣�
- SalesQuantity = Convert.ToDecimal(erpDto.FQty),//閿�鍞暟閲�
- IsFree = Convert.ToDecimal(erpDto.FIsFree),//鏄惁璧犲搧
- ReturnDate = ParseDateTime(erpDto.FDeliverydate),//閫�璐ф棩鏈�
- Warehouse = erpDto.FStockId,//浠撳簱
- PlanTrackingNumber = erpDto.FMtoNo,//璁″垝璺熻釜鍙�
- LotNumber = erpDto.FLot,//鎵瑰彿
- Note = erpDto.FEntryDescription,//澶囨敞
- ReturnType = erpDto.FRmType,//閫�璐х被鍨�
- InventoryUnit = erpDto.FStockUnitID,//搴撳瓨鍗曚綅
- InventoryQuantity = Convert.ToDecimal(erpDto.FStockQty),//搴撳瓨鏁伴噺
- MaterialCategory = erpDto.FMaterialType,//鐗╂枡绫诲埆
- OwnerTypeId = erpDto.FOwnerTypeID,//璐т富绫诲瀷
- OwnerId = erpDto.FOwnerId,//璐т富
+ ErpLineId = erpDto.ErpID, //ERP琛孖D
+ ErpHeadId = erpDto.EHID, //ERP澶碔D
+ MaterialId = erpDto.FMaterialId, //鐗╂枡缂栧彿
+ MaterialName = erpDto.FMaterialName, // 鐗╂枡鍚嶇О
+ MaterialSpecification = erpDto.FMaterialModel, //瑙勬牸鍨嬪彿
+ SalesUnitId = erpDto.FUnitID, //閿�鍞崟浣�
+ SalesQuantity = Convert.ToDecimal(erpDto.FQty), //閿�鍞暟閲�
+ IsFree = Convert.ToDecimal(erpDto.FIsFree), //鏄惁璧犲搧
+ ReturnDate = ParseDateTime(erpDto.FDeliverydate), //閫�璐ф棩鏈�
+ Warehouse = erpDto.FStockId, //浠撳簱
+ PlanTrackingNumber = erpDto.FMtoNo, //璁″垝璺熻釜鍙�
+ LotNumber = erpDto.FLot, //鎵瑰彿
+ Note = erpDto.FEntryDescription, //澶囨敞
+ ReturnType = erpDto.FRmType, //閫�璐х被鍨�
+ InventoryUnit = erpDto.FStockUnitID, //搴撳瓨鍗曚綅
+ InventoryQuantity = Convert.ToDecimal(erpDto.FStockQty), //搴撳瓨鏁伴噺
+ MaterialCategory = erpDto.FMaterialType, //鐗╂枡绫诲埆
+ OwnerTypeId = erpDto.FOwnerTypeID, //璐т富绫诲瀷
+ OwnerId = erpDto.FOwnerId, //璐т富
SourceBillType = erpDto.FSrcType,
SourceBillNo = erpDto.FSrcBillNo,
OrderBillNo = erpDto.FOrderNo,
- SalesOrder = erpDto.F_XSHTH,
- CustOrder = erpDto.F_ZJXF_Text_re5_lee
-
+ SalesOrder = erpDto.F_XSHTH,
+ CustOrder = erpDto.F_ZJXF_Text_re5_lee
};
- var single = _SalesReturnDetailManager.GetSingle(it =>it.ErpLineId == salesOrderSub.ErpLineId);
- if (single != null)
- {
- salesOrderSub.Id = single.Id;
- }
+ var single = _SalesReturnDetailManager.GetSingle(it =>
+ it.ErpLineId == salesOrderSub.ErpLineId);
+ if (single != null) salesOrderSub.Id = single.Id;
salesOrderSubList.Add(salesOrderSub);
}
return salesOrderSubList;
}
-
-
}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs
index cdab8cf..23ba63f 100644
--- a/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -13,7 +13,8 @@
// Save 鏂规硶鐢ㄤ簬淇濆瓨鍗曚釜閮ㄩ棬璁板綍锛屾牴鎹被鍨嬫墽琛屼笉鍚岀殑鎿嶄綔
public bool Save(ErpDepartment department)
{
- var entity = GetSysDepartment(department); // 灏� ErpDepartment 杞崲涓� SysDepartment
+ var entity =
+ GetSysDepartment(department); // 灏� ErpDepartment 杞崲涓� SysDepartment
return UseTransaction(db =>
{
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/PcbTestDataService.cs b/MES.Service/service/QC/PcbTestDataService.cs
index 2f70d7b..0f5aa5c 100644
--- a/MES.Service/service/QC/PcbTestDataService.cs
+++ b/MES.Service/service/QC/PcbTestDataService.cs
@@ -1,366 +1,381 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
-namespace MES.Service.service.QC
+namespace MES.Service.service.QC;
+
+/// <summary>
+/// PCB妫�娴嬫暟鎹湇鍔�
+/// </summary>
+public class PcbTestDataService
{
/// <summary>
- /// PCB妫�娴嬫暟鎹湇鍔�
+ /// 淇濆瓨鏁存澘妫�娴嬫暟鎹�
/// </summary>
- public class PcbTestDataService
+ /// <param name="dto">鏁存澘妫�娴嬫暟鎹瓺TO</param>
+ /// <returns>淇濆瓨缁撴灉</returns>
+ public bool SaveWholeboardData(WholeboardGenerateDto dto)
{
- /// <summary>
- /// 淇濆瓨鏁存澘妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="dto">鏁存澘妫�娴嬫暟鎹瓺TO</param>
- /// <returns>淇濆瓨缁撴灉</returns>
- public bool SaveWholeboardData(WholeboardGenerateDto dto)
+ try
{
- try
+ return SqlSugarHelper.UseTransactionWithOracle(db =>
{
- return SqlSugarHelper.UseTransactionWithOracle(db =>
+ var testData = ConvertWholeboardToEntity(dto);
+ testData.CreateTime = DateTime.Now;
+ testData.DataType = "WHOLE";
+
+ var testDataId =
+ db.Insertable(testData).ExecuteReturnIdentity();
+
+ var affectedRows = 1;
+ if (dto.BoardData != null && dto.BoardData.Count > 0)
{
- var testData = ConvertWholeboardToEntity(dto);
- testData.CreateTime = DateTime.Now;
- testData.DataType = "WHOLE";
-
- var testDataId = db.Insertable(testData).ExecuteReturnIdentity();
-
- var affectedRows = 1;
- if (dto.BoardData != null && dto.BoardData.Count > 0)
- {
- var componentDataList = new List<MesPcbComponentData>();
- foreach (var boardData in dto.BoardData)
+ var componentDataList = new List<MesPcbComponentData>();
+ foreach (var boardData in dto.BoardData)
+ if (boardData.CompData != null &&
+ boardData.CompData.Count > 0)
{
- if (boardData.CompData != null && boardData.CompData.Count > 0)
- {
- var componentData = ConvertComponentListToEntity(boardData.CompData, testDataId);
- componentDataList.AddRange(componentData);
- }
+ var componentData =
+ ConvertComponentListToEntity(boardData.CompData,
+ testDataId);
+ componentDataList.AddRange(componentData);
}
- if (componentDataList.Count > 0)
- {
- affectedRows += db.Insertable(componentDataList).ExecuteCommand();
- }
- }
+ if (componentDataList.Count > 0)
+ affectedRows += db.Insertable(componentDataList)
+ .ExecuteCommand();
+ }
- return affectedRows;
- }) > 0;
- }
- catch (Exception ex)
- {
- throw new Exception($"淇濆瓨鏁存澘妫�娴嬫暟鎹け璐�: {ex.Message}", ex);
- }
+ return affectedRows;
+ }) > 0;
}
-
- /// <summary>
- /// 淇濆瓨鍗曟澘妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="dto">鍗曟澘妫�娴嬫暟鎹瓺TO</param>
- /// <returns>淇濆瓨缁撴灉</returns>
- public bool SaveSingleBoardData(SingleBoardGenerateDto dto)
+ catch (Exception ex)
{
- try
- {
- return SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- var testData = ConvertSingleBoardToEntity(dto);
- testData.CreateTime = DateTime.Now;
- testData.DataType = "SINGLE";
-
- var testDataId = db.Insertable(testData).ExecuteReturnIdentity();
-
- var affectedRows = 1;
- if (dto.CompData != null && dto.CompData.Count > 0)
- {
- var componentDataList = ConvertComponentListToEntity(dto.CompData, testDataId);
- affectedRows += db.Insertable(componentDataList).ExecuteCommand();
- }
-
- return affectedRows;
- }) > 0;
- }
- catch (Exception ex)
- {
- throw new Exception($"淇濆瓨鍗曟澘妫�娴嬫暟鎹け璐�: {ex.Message}", ex);
- }
+ throw new Exception($"淇濆瓨鏁存澘妫�娴嬫暟鎹け璐�: {ex.Message}", ex);
}
-
- /// <summary>
- /// 鏍规嵁ID鑾峰彇PCB妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="id">鏁版嵁ID</param>
- /// <returns>PCB妫�娴嬫暟鎹�</returns>
- public MesPcbTestData GetPcbTestDataById(decimal id)
- {
- try
- {
- var db = SqlSugarHelper.GetInstance();
- return db.Queryable<MesPcbTestData>()
- .Where(x => x.Id == id)
- .First();
- }
- catch (Exception ex)
- {
- throw new Exception($"鑾峰彇PCB妫�娴嬫暟鎹け璐�: {ex.Message}", ex);
- }
- }
-
- /// <summary>
- /// 鏍规嵁鏉′欢鍒嗛〉鏌ヨPCB妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="dataType">鏁版嵁绫诲瀷锛圵HOLE/SINGLE锛�</param>
- /// <param name="deviceName">璁惧鍚嶇О</param>
- /// <param name="pcbSn">PCB鏉＄爜</param>
- /// <param name="startTime">寮�濮嬫椂闂�</param>
- /// <param name="endTime">缁撴潫鏃堕棿</param>
- /// <param name="pageIndex">椤电爜</param>
- /// <param name="pageSize">椤靛ぇ灏�</param>
- /// <returns>鍒嗛〉鏁版嵁</returns>
- public (List<MesPcbTestData> items, int totalCount) GetPcbTestDataPage(
- string dataType = null,
- string deviceName = null,
- string pcbSn = null,
- DateTime? startTime = null,
- DateTime? endTime = null,
- int pageIndex = 1,
- int pageSize = 20)
- {
- try
- {
- var db = SqlSugarHelper.GetInstance();
- var totalCount = 0;
-
- var data = db.Queryable<MesPcbTestData>()
- .WhereIF(StringUtil.IsNotNullOrEmpty(dataType), x => x.DataType == dataType)
- .WhereIF(StringUtil.IsNotNullOrEmpty(deviceName), x => x.DeviceName.Contains(deviceName))
- .WhereIF(StringUtil.IsNotNullOrEmpty(pcbSn), x => x.PcbSn.Contains(pcbSn))
- .WhereIF(startTime.HasValue, x => x.PcbTestTime >= startTime.Value)
- .WhereIF(endTime.HasValue, x => x.PcbTestTime <= endTime.Value)
- .OrderBy(x => x.PcbTestTime, OrderByType.Desc)
- .ToPageList(pageIndex, pageSize, ref totalCount);
-
- return (data, totalCount);
- }
- catch (Exception ex)
- {
- throw new Exception($"鏌ヨPCB妫�娴嬫暟鎹け璐�: {ex.Message}", ex);
- }
- }
-
- /// <summary>
- /// 鏍规嵁娴嬭瘯鏁版嵁ID鑾峰彇鍣ㄤ欢鏁版嵁
- /// </summary>
- /// <param name="testDataId">娴嬭瘯鏁版嵁ID</param>
- /// <returns>鍣ㄤ欢鏁版嵁鍒楄〃</returns>
- public List<MesPcbComponentData> GetComponentDataByTestDataId(decimal testDataId)
- {
- try
- {
- var db = SqlSugarHelper.GetInstance();
- return db.Queryable<MesPcbComponentData>()
- .Where(x => x.TestDataId == testDataId)
- .OrderBy(x => x.CompDesignator)
- .ToList();
- }
- catch (Exception ex)
- {
- throw new Exception($"鑾峰彇鍣ㄤ欢鏁版嵁澶辫触: {ex.Message}", ex);
- }
- }
-
- /// <summary>
- /// 鏍规嵁PCB鏉＄爜鑾峰彇妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="pcbSn">PCB鏉＄爜</param>
- /// <returns>妫�娴嬫暟鎹垪琛�</returns>
- public List<MesPcbTestData> GetPcbTestDataByPcbSn(string pcbSn)
- {
- try
- {
- var db = SqlSugarHelper.GetInstance();
- return db.Queryable<MesPcbTestData>()
- .Where(x => x.PcbSn == pcbSn)
- .OrderBy(x => x.PcbTestTime, OrderByType.Desc)
- .ToList();
- }
- catch (Exception ex)
- {
- throw new Exception($"鏍规嵁PCB鏉＄爜鑾峰彇妫�娴嬫暟鎹け璐�: {ex.Message}", ex);
- }
- }
-
- /// <summary>
- /// 鍒犻櫎PCB妫�娴嬫暟鎹紙绾ц仈鍒犻櫎鍣ㄤ欢鏁版嵁锛�
- /// </summary>
- /// <param name="id">鏁版嵁ID</param>
- /// <returns>鍒犻櫎缁撴灉</returns>
- public bool DeletePcbTestData(decimal id)
- {
- try
- {
- return SqlSugarHelper.UseTransactionWithOracle(db =>
- {
- var affectedRows = 0;
-
- // 鍏堝垹闄ゅ櫒浠舵暟鎹�
- affectedRows += db.Deleteable<MesPcbComponentData>()
- .Where(x => x.TestDataId == id)
- .ExecuteCommand();
-
- // 鍐嶅垹闄や富鏁版嵁
- affectedRows += db.Deleteable<MesPcbTestData>()
- .Where(x => x.Id == id)
- .ExecuteCommand();
-
- return affectedRows;
- }) > 0;
- }
- catch (Exception ex)
- {
- throw new Exception($"鍒犻櫎PCB妫�娴嬫暟鎹け璐�: {ex.Message}", ex);
- }
- }
-
- /// <summary>
- /// 鑾峰彇妫�娴嬬粺璁℃暟鎹�
- /// </summary>
- /// <param name="dataType">鏁版嵁绫诲瀷</param>
- /// <param name="deviceName">璁惧鍚嶇О</param>
- /// <param name="startTime">寮�濮嬫椂闂�</param>
- /// <param name="endTime">缁撴潫鏃堕棿</param>
- /// <returns>缁熻鏁版嵁</returns>
- public dynamic GetTestStatistics(string dataType = null, string deviceName = null,
- DateTime? startTime = null, DateTime? endTime = null)
- {
- try
- {
- var db = SqlSugarHelper.GetInstance();
-
- var statistics = db.Queryable<MesPcbTestData>()
- .WhereIF(StringUtil.IsNotNullOrEmpty(dataType), x => x.DataType == dataType)
- .WhereIF(StringUtil.IsNotNullOrEmpty(deviceName), x => x.DeviceName == deviceName)
- .WhereIF(startTime.HasValue, x => x.PcbTestTime >= startTime.Value)
- .WhereIF(endTime.HasValue, x => x.PcbTestTime <= endTime.Value)
- .GroupBy(x => new { x.DataType, x.DeviceName })
- .Select(x => new
- {
- DataType = x.DataType,
- DeviceName = x.DeviceName,
- TotalCount = SqlFunc.AggregateCount(x.Id),
- PassCount = SqlFunc.AggregateCount(SqlFunc.IIF(x.PcbFinalResult == "PASS", x.Id, 0)),
- FailCount = SqlFunc.AggregateCount(SqlFunc.IIF(x.PcbFinalResult == "FAIL", x.Id, 0)),
- AvgCycleTime = SqlFunc.AggregateAvg(x.PcbCycleTime)
- })
- .ToList();
-
- return statistics;
- }
- catch (Exception ex)
- {
- throw new Exception($"鑾峰彇妫�娴嬬粺璁℃暟鎹け璐�: {ex.Message}", ex);
- }
- }
-
- #region 绉佹湁鏂规硶 - DTO杞崲
-
- /// <summary>
- /// 灏嗘暣鏉緿TO杞崲涓哄疄浣�
- /// </summary>
- /// <param name="dto">鏁存澘DTO</param>
- /// <returns>瀹炰綋瀵硅薄</returns>
- private MesPcbTestData ConvertWholeboardToEntity(WholeboardGenerateDto dto)
- {
- return new MesPcbTestData
- {
- DeviceName = dto.DeviceName,
- PcbSn = dto.PcbSn,
- PcbTrackLine = dto.PcbTrackLine,
- PcbBoardSide = dto.PcbBoardSide,
- PcbTestTime = StringUtil.IsNotNullOrEmpty(dto.PcbTestTime) ?
- DateTime.Parse(dto.PcbTestTime) : null,
- PcbCycleTime = (decimal?)dto.PcbCycleTime,
- PcbProjectName = dto.PcbProjectName,
- PcbRobotResult = dto.PcbRobotResult,
- PcbUserResult = dto.PcbUserResult,
- PcbFinalResult = dto.PcbFinalResult,
- PcbRepairUser = dto.PcbRepairUser,
- PcbBoardNumber = dto.PcbBoardNumber,
- PcbBoardRobotNgNumber = dto.PcbBoardRobotNgNumber,
- PcbBoardUserNgNumber = dto.PcbBoardUserNgNumber,
- PcbBoardRepassNumber = dto.PcbBoardRepassNumber,
- PcbCompNumber = dto.PcbCompNumber,
- PcbCompRobotNgNumber = dto.PcbCompRobotNgNumber,
- PcbCompUserNgNumber = dto.PcbCompUserNgNumber,
- PcbCompRepassNumber = dto.PcbCompRepassNumber
- };
- }
-
- /// <summary>
- /// 灏嗗崟鏉緿TO杞崲涓哄疄浣�
- /// </summary>
- /// <param name="dto">鍗曟澘DTO</param>
- /// <returns>瀹炰綋瀵硅薄</returns>
- private MesPcbTestData ConvertSingleBoardToEntity(SingleBoardGenerateDto dto)
- {
- return new MesPcbTestData
- {
- DeviceName = dto.DeviceName,
- PcbSn = dto.PcbSn,
- PcbTrackLine = dto.PcbTrackLine,
- PcbBoardSide = dto.PcbBoardSide,
- PcbTestTime = StringUtil.IsNotNullOrEmpty(dto.PcbTestTime) ?
- DateTime.Parse(dto.PcbTestTime) : null,
- PcbCycleTime = (decimal?)dto.PcbCycleTime,
- PcbProjectName = dto.PcbProjectName,
- PcbRobotResult = dto.PcbRobotResult,
- PcbUserResult = dto.PcbUserResult,
- PcbFinalResult = dto.PcbFinalResult,
- PcbRepairUser = dto.PcbRepairUser,
- PcbBoardNumber = dto.PcbBoardNumber,
- PcbCompNumber = dto.PcbCompNumber,
- BoardSn = dto.BoardSn,
- BoardNo = dto.BoardNo,
- BoardRobotResult = dto.BoardRobotResult,
- BoardUserResult = dto.BoardUserResult,
- BoardFinalResult = dto.BoardFinalResult,
- BoardCompNumber = dto.BoardCompNumber,
- BoardCompRobotNgNumber = dto.BoardCompRobotNgNumber,
- BoardCompUserNgNumber = dto.BoardCompUserNgNumber,
- BoardCompRepassNumber = dto.BoardCompRepassNumber
- };
- }
-
- /// <summary>
- /// 灏嗗櫒浠禗TO鍒楄〃杞崲涓哄疄浣撳垪琛�
- /// </summary>
- /// <param name="dtoList">鍣ㄤ欢DTO鍒楄〃</param>
- /// <param name="testDataId">娴嬭瘯鏁版嵁ID</param>
- /// <returns>瀹炰綋鍒楄〃</returns>
- private List<MesPcbComponentData> ConvertComponentListToEntity(List<ComponentDataDto> dtoList, decimal testDataId)
- {
- return dtoList.Select(dto => new MesPcbComponentData
- {
- TestDataId = testDataId,
- CompDesignator = dto.CompDesignator,
- CompPart = dto.CompPart,
- CompPackage = dto.CompPackage,
- CompType = dto.CompType,
- CompRobotCode = dto.CompRobotCode,
- CompRobotResult = dto.CompRobotResult,
- CompUserCode = dto.CompUserCode,
- CompUserResult = dto.CompUserResult,
- CompImage = dto.CompImage,
- CreateTime = DateTime.Now
- }).ToList();
- }
-
- #endregion
}
+
+ /// <summary>
+ /// 淇濆瓨鍗曟澘妫�娴嬫暟鎹�
+ /// </summary>
+ /// <param name="dto">鍗曟澘妫�娴嬫暟鎹瓺TO</param>
+ /// <returns>淇濆瓨缁撴灉</returns>
+ public bool SaveSingleBoardData(SingleBoardGenerateDto dto)
+ {
+ try
+ {
+ return SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ var testData = ConvertSingleBoardToEntity(dto);
+ testData.CreateTime = DateTime.Now;
+ testData.DataType = "SINGLE";
+
+ var testDataId =
+ db.Insertable(testData).ExecuteReturnIdentity();
+
+ var affectedRows = 1;
+ if (dto.CompData != null && dto.CompData.Count > 0)
+ {
+ var componentDataList =
+ ConvertComponentListToEntity(dto.CompData, testDataId);
+ affectedRows += db.Insertable(componentDataList)
+ .ExecuteCommand();
+ }
+
+ return affectedRows;
+ }) > 0;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"淇濆瓨鍗曟澘妫�娴嬫暟鎹け璐�: {ex.Message}", ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁ID鑾峰彇PCB妫�娴嬫暟鎹�
+ /// </summary>
+ /// <param name="id">鏁版嵁ID</param>
+ /// <returns>PCB妫�娴嬫暟鎹�</returns>
+ public MesPcbTestData GetPcbTestDataById(decimal id)
+ {
+ try
+ {
+ var db = SqlSugarHelper.GetInstance();
+ return db.Queryable<MesPcbTestData>()
+ .Where(x => x.Id == id)
+ .First();
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鑾峰彇PCB妫�娴嬫暟鎹け璐�: {ex.Message}", ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁鏉′欢鍒嗛〉鏌ヨPCB妫�娴嬫暟鎹�
+ /// </summary>
+ /// <param name="dataType">鏁版嵁绫诲瀷锛圵HOLE/SINGLE锛�</param>
+ /// <param name="deviceName">璁惧鍚嶇О</param>
+ /// <param name="pcbSn">PCB鏉＄爜</param>
+ /// <param name="startTime">寮�濮嬫椂闂�</param>
+ /// <param name="endTime">缁撴潫鏃堕棿</param>
+ /// <param name="pageIndex">椤电爜</param>
+ /// <param name="pageSize">椤靛ぇ灏�</param>
+ /// <returns>鍒嗛〉鏁版嵁</returns>
+ public (List<MesPcbTestData> items, int totalCount) GetPcbTestDataPage(
+ string dataType = null,
+ string deviceName = null,
+ string pcbSn = null,
+ DateTime? startTime = null,
+ DateTime? endTime = null,
+ int pageIndex = 1,
+ int pageSize = 20)
+ {
+ try
+ {
+ var db = SqlSugarHelper.GetInstance();
+ var totalCount = 0;
+
+ var data = db.Queryable<MesPcbTestData>()
+ .WhereIF(StringUtil.IsNotNullOrEmpty(dataType),
+ x => x.DataType == dataType)
+ .WhereIF(StringUtil.IsNotNullOrEmpty(deviceName),
+ x => x.DeviceName.Contains(deviceName))
+ .WhereIF(StringUtil.IsNotNullOrEmpty(pcbSn),
+ x => x.PcbSn.Contains(pcbSn))
+ .WhereIF(startTime.HasValue,
+ x => x.PcbTestTime >= startTime.Value)
+ .WhereIF(endTime.HasValue, x => x.PcbTestTime <= endTime.Value)
+ .OrderBy(x => x.PcbTestTime, OrderByType.Desc)
+ .ToPageList(pageIndex, pageSize, ref totalCount);
+
+ return (data, totalCount);
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鏌ヨPCB妫�娴嬫暟鎹け璐�: {ex.Message}", ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁娴嬭瘯鏁版嵁ID鑾峰彇鍣ㄤ欢鏁版嵁
+ /// </summary>
+ /// <param name="testDataId">娴嬭瘯鏁版嵁ID</param>
+ /// <returns>鍣ㄤ欢鏁版嵁鍒楄〃</returns>
+ public List<MesPcbComponentData> GetComponentDataByTestDataId(
+ decimal testDataId)
+ {
+ try
+ {
+ var db = SqlSugarHelper.GetInstance();
+ return db.Queryable<MesPcbComponentData>()
+ .Where(x => x.TestDataId == testDataId)
+ .OrderBy(x => x.CompDesignator)
+ .ToList();
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鑾峰彇鍣ㄤ欢鏁版嵁澶辫触: {ex.Message}", ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁PCB鏉＄爜鑾峰彇妫�娴嬫暟鎹�
+ /// </summary>
+ /// <param name="pcbSn">PCB鏉＄爜</param>
+ /// <returns>妫�娴嬫暟鎹垪琛�</returns>
+ public List<MesPcbTestData> GetPcbTestDataByPcbSn(string pcbSn)
+ {
+ try
+ {
+ var db = SqlSugarHelper.GetInstance();
+ return db.Queryable<MesPcbTestData>()
+ .Where(x => x.PcbSn == pcbSn)
+ .OrderBy(x => x.PcbTestTime, OrderByType.Desc)
+ .ToList();
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鏍规嵁PCB鏉＄爜鑾峰彇妫�娴嬫暟鎹け璐�: {ex.Message}", ex);
+ }
+ }
+
+ /// <summary>
+ /// 鍒犻櫎PCB妫�娴嬫暟鎹紙绾ц仈鍒犻櫎鍣ㄤ欢鏁版嵁锛�
+ /// </summary>
+ /// <param name="id">鏁版嵁ID</param>
+ /// <returns>鍒犻櫎缁撴灉</returns>
+ public bool DeletePcbTestData(decimal id)
+ {
+ try
+ {
+ return SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ var affectedRows = 0;
+
+ // 鍏堝垹闄ゅ櫒浠舵暟鎹�
+ affectedRows += db.Deleteable<MesPcbComponentData>()
+ .Where(x => x.TestDataId == id)
+ .ExecuteCommand();
+
+ // 鍐嶅垹闄や富鏁版嵁
+ affectedRows += db.Deleteable<MesPcbTestData>()
+ .Where(x => x.Id == id)
+ .ExecuteCommand();
+
+ return affectedRows;
+ }) > 0;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鍒犻櫎PCB妫�娴嬫暟鎹け璐�: {ex.Message}", ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇妫�娴嬬粺璁℃暟鎹�
+ /// </summary>
+ /// <param name="dataType">鏁版嵁绫诲瀷</param>
+ /// <param name="deviceName">璁惧鍚嶇О</param>
+ /// <param name="startTime">寮�濮嬫椂闂�</param>
+ /// <param name="endTime">缁撴潫鏃堕棿</param>
+ /// <returns>缁熻鏁版嵁</returns>
+ public dynamic GetTestStatistics(string dataType = null,
+ string deviceName = null,
+ DateTime? startTime = null, DateTime? endTime = null)
+ {
+ try
+ {
+ var db = SqlSugarHelper.GetInstance();
+
+ var statistics = db.Queryable<MesPcbTestData>()
+ .WhereIF(StringUtil.IsNotNullOrEmpty(dataType),
+ x => x.DataType == dataType)
+ .WhereIF(StringUtil.IsNotNullOrEmpty(deviceName),
+ x => x.DeviceName == deviceName)
+ .WhereIF(startTime.HasValue,
+ x => x.PcbTestTime >= startTime.Value)
+ .WhereIF(endTime.HasValue, x => x.PcbTestTime <= endTime.Value)
+ .GroupBy(x => new { x.DataType, x.DeviceName })
+ .Select(x => new
+ {
+ x.DataType,
+ x.DeviceName,
+ TotalCount = SqlFunc.AggregateCount(x.Id),
+ PassCount = SqlFunc.AggregateCount(
+ SqlFunc.IIF(x.PcbFinalResult == "PASS", x.Id, 0)),
+ FailCount = SqlFunc.AggregateCount(
+ SqlFunc.IIF(x.PcbFinalResult == "FAIL", x.Id, 0)),
+ AvgCycleTime = SqlFunc.AggregateAvg(x.PcbCycleTime)
+ })
+ .ToList();
+
+ return statistics;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鑾峰彇妫�娴嬬粺璁℃暟鎹け璐�: {ex.Message}", ex);
+ }
+ }
+
+ #region 绉佹湁鏂规硶 - DTO杞崲
+
+ /// <summary>
+ /// 灏嗘暣鏉緿TO杞崲涓哄疄浣�
+ /// </summary>
+ /// <param name="dto">鏁存澘DTO</param>
+ /// <returns>瀹炰綋瀵硅薄</returns>
+ private MesPcbTestData ConvertWholeboardToEntity(WholeboardGenerateDto dto)
+ {
+ return new MesPcbTestData
+ {
+ DeviceName = dto.DeviceName,
+ PcbSn = dto.PcbSn,
+ PcbTrackLine = dto.PcbTrackLine,
+ PcbBoardSide = dto.PcbBoardSide,
+ PcbTestTime = StringUtil.IsNotNullOrEmpty(dto.PcbTestTime)
+ ? DateTime.Parse(dto.PcbTestTime)
+ : null,
+ PcbCycleTime = (decimal?)dto.PcbCycleTime,
+ PcbProjectName = dto.PcbProjectName,
+ PcbRobotResult = dto.PcbRobotResult,
+ PcbUserResult = dto.PcbUserResult,
+ PcbFinalResult = dto.PcbFinalResult,
+ PcbRepairUser = dto.PcbRepairUser,
+ PcbBoardNumber = dto.PcbBoardNumber,
+ PcbBoardRobotNgNumber = dto.PcbBoardRobotNgNumber,
+ PcbBoardUserNgNumber = dto.PcbBoardUserNgNumber,
+ PcbBoardRepassNumber = dto.PcbBoardRepassNumber,
+ PcbCompNumber = dto.PcbCompNumber,
+ PcbCompRobotNgNumber = dto.PcbCompRobotNgNumber,
+ PcbCompUserNgNumber = dto.PcbCompUserNgNumber,
+ PcbCompRepassNumber = dto.PcbCompRepassNumber
+ };
+ }
+
+ /// <summary>
+ /// 灏嗗崟鏉緿TO杞崲涓哄疄浣�
+ /// </summary>
+ /// <param name="dto">鍗曟澘DTO</param>
+ /// <returns>瀹炰綋瀵硅薄</returns>
+ private MesPcbTestData ConvertSingleBoardToEntity(
+ SingleBoardGenerateDto dto)
+ {
+ return new MesPcbTestData
+ {
+ DeviceName = dto.DeviceName,
+ PcbSn = dto.PcbSn,
+ PcbTrackLine = dto.PcbTrackLine,
+ PcbBoardSide = dto.PcbBoardSide,
+ PcbTestTime = StringUtil.IsNotNullOrEmpty(dto.PcbTestTime)
+ ? DateTime.Parse(dto.PcbTestTime)
+ : null,
+ PcbCycleTime = (decimal?)dto.PcbCycleTime,
+ PcbProjectName = dto.PcbProjectName,
+ PcbRobotResult = dto.PcbRobotResult,
+ PcbUserResult = dto.PcbUserResult,
+ PcbFinalResult = dto.PcbFinalResult,
+ PcbRepairUser = dto.PcbRepairUser,
+ PcbBoardNumber = dto.PcbBoardNumber,
+ PcbCompNumber = dto.PcbCompNumber,
+ BoardSn = dto.BoardSn,
+ BoardNo = dto.BoardNo,
+ BoardRobotResult = dto.BoardRobotResult,
+ BoardUserResult = dto.BoardUserResult,
+ BoardFinalResult = dto.BoardFinalResult,
+ BoardCompNumber = dto.BoardCompNumber,
+ BoardCompRobotNgNumber = dto.BoardCompRobotNgNumber,
+ BoardCompUserNgNumber = dto.BoardCompUserNgNumber,
+ BoardCompRepassNumber = dto.BoardCompRepassNumber
+ };
+ }
+
+ /// <summary>
+ /// 灏嗗櫒浠禗TO鍒楄〃杞崲涓哄疄浣撳垪琛�
+ /// </summary>
+ /// <param name="dtoList">鍣ㄤ欢DTO鍒楄〃</param>
+ /// <param name="testDataId">娴嬭瘯鏁版嵁ID</param>
+ /// <returns>瀹炰綋鍒楄〃</returns>
+ private List<MesPcbComponentData> ConvertComponentListToEntity(
+ List<ComponentDataDto> dtoList, decimal testDataId)
+ {
+ return dtoList.Select(dto => new MesPcbComponentData
+ {
+ TestDataId = testDataId,
+ CompDesignator = dto.CompDesignator,
+ CompPart = dto.CompPart,
+ CompPackage = dto.CompPackage,
+ CompType = dto.CompType,
+ CompRobotCode = dto.CompRobotCode,
+ CompRobotResult = dto.CompRobotResult,
+ CompUserCode = dto.CompUserCode,
+ CompUserResult = dto.CompUserResult,
+ CompImage = dto.CompImage,
+ CreateTime = DateTime.Now
+ }).ToList();
+ }
+
+ #endregion
}
\ No newline at end of file
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index f26b366..56e9ef3 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -1,6 +1,4 @@
-锘縰sing System.Net.NetworkInformation;
-using Masuit.Tools.Models;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
@@ -75,29 +73,28 @@
var qsItemOqcItems = db
.Queryable<MesQualityStandard>()
.Where(b => b.QsType == "3"
- && b.ItemNo == itemNo).Select(
- b => new QsItemOqcItem
- {
- ProjName = b.ProjName,
- ItemMod = b.ItemMod,
- InspectionMethod = b.InspectionMethod,
- UsingInstruments = b.UsingInstruments,
- LevelNum = SqlFunc.IsNull(
- SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
- b.InspectionLevel),
- MaxValue = b.MaxValue,
- StandardValue = b.StandardValue,
- MinValue = b.MinValue,
- Notes = b.Notes,
- FcheckLevel = b.FcheckLevel,
- FacLevel = b.FacLevel,
- QsCode = b.QsCode,
- QsName = b.QsName,
- Result = "鏈娴�",
- isCheck = 0,
- Picture = b.Picture,
- Picturename = b.Picturename
- }).ToList();
+ && b.ItemNo == itemNo).Select(b => new QsItemOqcItem
+ {
+ ProjName = b.ProjName,
+ ItemMod = b.ItemMod,
+ InspectionMethod = b.InspectionMethod,
+ UsingInstruments = b.UsingInstruments,
+ LevelNum = SqlFunc.IsNull(
+ SqlFunc.IsNull(b.LevelNum * b.InspectionLevel, 1),
+ b.InspectionLevel),
+ MaxValue = b.MaxValue,
+ StandardValue = b.StandardValue,
+ MinValue = b.MinValue,
+ Notes = b.Notes,
+ FcheckLevel = b.FcheckLevel,
+ FacLevel = b.FacLevel,
+ QsCode = b.QsCode,
+ QsName = b.QsName,
+ Result = "鏈娴�",
+ isCheck = 0,
+ Picture = b.Picture,
+ Picturename = b.Picturename
+ }).ToList();
qsItemOqcItems.ForEach(item =>
{
@@ -236,7 +233,9 @@
.First();
decimal? pid = 0;
- pid = qsItemOqcReq == null ? db.Insertable(xj).ExecuteReturnIdentity() : qsItemOqcReq.Id;
+ pid = qsItemOqcReq == null
+ ? db.Insertable(xj).ExecuteReturnIdentity()
+ : qsItemOqcReq.Id;
xj.Id = pid;
@@ -358,8 +357,8 @@
result = 1;
else if (count - passCount < QsItemOqcItem.FreQty) result = 1;
- var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
- db =>
+ var useTransactionWithOracle =
+ SqlSugarHelper.UseTransactionWithOracle(db =>
{
var commit = 0;
commit += db.Updateable<QsItemOqcItem>()
@@ -410,21 +409,19 @@
// saveDetect02(detail.Gid, detail.CreateBy);
- var oqcReq = db.Queryable<QsItemOqcReq>()
- .Where(s => s.Id == detail.Gid)
- .Select<string?>(s=>s.BillNo)
- .First();
+ var oqcReq = db.Queryable<QsItemOqcReq>()
+ .Where(s => s.Id == detail.Gid)
+ .Select<string?>(s => s.BillNo)
+ .First();
if (oqcReq != null)
- {
//FSTATUS
//CHECK_RES
db.Updateable<MesInvItemIns>()
.SetColumns(s => s.Fstatus == 1)
- .SetColumns(s=>s.CheckRes == FcheckResu)
+ .SetColumns(s => s.CheckRes == FcheckResu)
.Where(s => s.BillNo == oqcReq)
.ExecuteCommand();
- }
return useTransactionWithOracle;
}
@@ -474,59 +471,66 @@
}
- public (List<QsItemOqcReq> items, int TotalCount) getPage(XJPageResult queryObj)
+ public (List<QsItemOqcReq> items, int TotalCount) getPage(
+ XJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
var totalCount = 0;
- var qsItemOqcReqs = db.Queryable<QsItemOqcReq, MesItems, MesInvItemIns, Womdaa, MesInvTransaction, RKJDaa001, MesLine>(
- (a, b, c, da, ca, m, l) => new JoinQueryInfos(
- JoinType.Left, a.ItemNo == b.Id.ToString(),
- JoinType.Left, a.BillNo == c.BillNo,
- JoinType.Left, da.Daa001 == c.RbillNo,
- JoinType.Left, c.TransctionNo == ca.TransactionNo.ToString()
- && c.Company == ca.Company
- && c.Factory == ca.Factory,
- JoinType.Left, m.ItemInId == c.Id,
- JoinType.Left, l.LineNo == da.Daa015
- ))
- //.WhereIF(!"PL017".Equals(queryObj.createUser),
- // (a, b, c, da, ca, m) => lineNo.Contains(da.Daa015))
- .WhereIF(!string.IsNullOrEmpty(queryObj.id), (a, b, c, da, ca, m, l) => a.Id.ToString() == queryObj.id)
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.result) && "鏈畬鎴�".Equals(queryObj.result),
- (a, b, c, da, ca, m, l) => a.FcheckResu == null)
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.result) && !"鏈畬鎴�".Equals(queryObj.result),
- (a, b, c, da, ca, m, l) => a.FcheckResu != null)
- .WhereIF(
- StringUtil.IsNotNullOrEmpty(queryObj.SearchValue),
- (a, b, c, da, ca, m, l) => a.ReleaseNo.Contains(queryObj.SearchValue)
- || b.ItemNo.Contains(queryObj.SearchValue)
- )
- .Select((a, b, c, da, ca, m, l) => new QsItemOqcReq
- {
- BillNo = a.BillNo,
- Remarks = a.Remarks,
- Id = a.Id,
- CreateDate = a.CreateDate,
- CreateBy = a.CreateBy,
- FcheckResu = a.FcheckResu,
- ItemNo = b.ItemNo,
- FcheckBy = a.FcheckBy,
- FcheckDate = a.FcheckDate,
- ReleaseNo = a.ReleaseNo,
- ItemName = b.ItemName,
- ItemModel = b.ItemModel,
- TaskNo = c.RbillNo,
- //CbillNo = c.CbillNo,
- //LineNo = da.Daa015,
- LineNo = l.LineName,
- Quantity = m.Quantity
- })
- .OrderBy(a => a.CreateDate, OrderByType.Desc)
- .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
+ var qsItemOqcReqs = db
+ .Queryable<QsItemOqcReq, MesItems, MesInvItemIns, Womdaa,
+ MesInvTransaction, RKJDaa001,
+ MesLine>((a, b, c, da, ca, m, l) => new JoinQueryInfos(
+ JoinType.Left, a.ItemNo == b.Id.ToString(),
+ JoinType.Left, a.BillNo == c.BillNo,
+ JoinType.Left, da.Daa001 == c.RbillNo,
+ JoinType.Left, c.TransctionNo == ca.TransactionNo.ToString()
+ && c.Company == ca.Company
+ && c.Factory == ca.Factory,
+ JoinType.Left, m.ItemInId == c.Id,
+ JoinType.Left, l.LineNo == da.Daa015
+ ))
+ //.WhereIF(!"PL017".Equals(queryObj.createUser),
+ // (a, b, c, da, ca, m) => lineNo.Contains(da.Daa015))
+ .WhereIF(!string.IsNullOrEmpty(queryObj.id),
+ (a, b, c, da, ca, m, l) => a.Id.ToString() == queryObj.id)
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.result) &&
+ "鏈畬鎴�".Equals(queryObj.result),
+ (a, b, c, da, ca, m, l) => a.FcheckResu == null)
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.result) &&
+ !"鏈畬鎴�".Equals(queryObj.result),
+ (a, b, c, da, ca, m, l) => a.FcheckResu != null)
+ .WhereIF(
+ StringUtil.IsNotNullOrEmpty(queryObj.SearchValue),
+ (a, b, c, da, ca, m, l) =>
+ a.ReleaseNo.Contains(queryObj.SearchValue)
+ || b.ItemNo.Contains(queryObj.SearchValue)
+ )
+ .Select((a, b, c, da, ca, m, l) => new QsItemOqcReq
+ {
+ BillNo = a.BillNo,
+ Remarks = a.Remarks,
+ Id = a.Id,
+ CreateDate = a.CreateDate,
+ CreateBy = a.CreateBy,
+ FcheckResu = a.FcheckResu,
+ ItemNo = b.ItemNo,
+ FcheckBy = a.FcheckBy,
+ FcheckDate = a.FcheckDate,
+ ReleaseNo = a.ReleaseNo,
+ ItemName = b.ItemName,
+ ItemModel = b.ItemModel,
+ TaskNo = c.RbillNo,
+ //CbillNo = c.CbillNo,
+ //LineNo = da.Daa015,
+ LineNo = l.LineName,
+ Quantity = m.Quantity
+ })
+ .OrderBy(a => a.CreateDate, OrderByType.Desc)
+ .ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
return (qsItemOqcReqs, totalCount);
}
@@ -688,19 +692,19 @@
var db = SqlSugarHelper.GetInstance();
var oqcReq = db.Queryable<QsItemOqcReq>()
- .Where(s => s.Id == rkjDto.gid)
- .Select<string?>(s => s.BillNo)
- .First();
+ .Where(s => s.Id == rkjDto.gid)
+ .Select<string?>(s => s.BillNo)
+ .First();
if (oqcReq != null)
{
//FSTATUS
//CHECK_RES
- var mesInvItemIns = db.Queryable<MesInvItemIns>()
+ var mesInvItemIns = db.Queryable<MesInvItemIns>()
.Where(s => s.BillNo == oqcReq).First();
- return db.Queryable<MesInvItemInCDetails2>()
- .Where(a=>a.ItemInId == mesInvItemIns.Id).ToList();
+ return db.Queryable<MesInvItemInCDetails2>()
+ .Where(a => a.ItemInId == mesInvItemIns.Id).ToList();
}
return new List<MesInvItemInCDetails2>();
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index b83cc8e..7292b12 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -1,5 +1,4 @@
-锘縰sing System.Buffers;
-using System.Data;
+锘縰sing System.Data;
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
@@ -18,7 +17,9 @@
{
var db = SqlSugarHelper.GetInstance();
var date = DateTime.Now.ToString("yyyy-MM-dd");
- var sql = "select max(BILL_NO) from QS_ITEM_IPI_REQ where to_char(CREATE_TIME,'yyyy-mm-dd') = '" + date + "'";
+ var sql =
+ "select max(BILL_NO) from QS_ITEM_IPI_REQ where to_char(CREATE_TIME,'yyyy-mm-dd') = '" +
+ date + "'";
var maxBillNo = db.Ado.SqlQuerySingle<string>(sql);
@@ -35,7 +36,8 @@
}
//鑾峰彇鎵�鏈夋暟鎹垎椤�
- public (List<SJPageResult> items, int TotalCount) getPage(SJPageResult queryObj)
+ public (List<SJPageResult> items, int TotalCount) getPage(
+ SJPageResult queryObj)
{
var db = SqlSugarHelper.GetInstance();
@@ -60,9 +62,11 @@
StringUtil.IsNotNullOrEmpty(queryObj.Result) &&
!"鏈畬鎴�".Equals(queryObj.Result),
a => a.Result != "鏈畬鎴�")
- .WhereIF(queryObj.Comments != null, a => a.Comments == queryObj.Comments)
- .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.SearchValue),a=>a.BillNo.Contains(queryObj.SearchValue)
- || a.ItemNo.Contains(queryObj.SearchValue))
+ .WhereIF(queryObj.Comments != null,
+ a => a.Comments == queryObj.Comments)
+ .WhereIF(StringUtil.IsNotNullOrEmpty(queryObj.SearchValue), a =>
+ a.BillNo.Contains(queryObj.SearchValue)
+ || a.ItemNo.Contains(queryObj.SearchValue))
.OrderBy(a => a.BillNo, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
@@ -109,8 +113,8 @@
return db
.Queryable<MesQualityStandard>()
- .Where(b => b.QsType == "1" && b.ItemNo == itemNo).Select(
- b => new QsItemIpiItem
+ .Where(b => b.QsType == "1" && b.ItemNo == itemNo).Select(b =>
+ new QsItemIpiItem
{
ProjName = b.ProjName,
ItemMod = b.ItemMod,
@@ -194,21 +198,20 @@
{
var qsItemIpiReq = item.From;
var qsItemIpiItems = item.Items;
- SqlSugarHelper.UseTransactionWithOracle(
- db =>
- {
- qsItemIpiReq.StatusDate = DateTime.Now;
- var pid = db.Insertable(qsItemIpiReq)
- .ExecuteReturnIdentity();
- qsItemIpiReq.Id = pid;
+ SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ qsItemIpiReq.StatusDate = DateTime.Now;
+ var pid = db.Insertable(qsItemIpiReq)
+ .ExecuteReturnIdentity();
+ qsItemIpiReq.Id = pid;
- item.gid = pid;
+ item.gid = pid;
- qsItemIpiItems.ForEach(s => s.Pid = pid);
+ qsItemIpiItems.ForEach(s => s.Pid = pid);
- return db.Insertable(qsItemIpiItems)
- .ExecuteCommand();
- });
+ return db.Insertable(qsItemIpiItems)
+ .ExecuteCommand();
+ });
item.Items = getQSItems(qsItemIpiReq.Id, null);
//娌℃湁涓婁笅闄愮殑妫�楠岄」鐩嚜鍔ㄧ洏鐐逛负鍚堟牸
@@ -228,7 +231,7 @@
item.Items = getQSItems(qsItemIpiReq.Id, null);
var sjPageResult = new SJPageResult
- { Id = item.From.Id, Limit = 1, PageIndex = 1 };
+ { Id = item.From.Id, Limit = 1, PageIndex = 1 };
item.Result = getPage(sjPageResult).items[0];
return item;
@@ -237,14 +240,13 @@
public QsItem SaveItem(QsItem item)
{
var qsItemIpiItems = item.Items;
- SqlSugarHelper.UseTransactionWithOracle(
- db =>
- {
- qsItemIpiItems.ForEach(s => s.Pid = item.gid);
+ SqlSugarHelper.UseTransactionWithOracle(db =>
+ {
+ qsItemIpiItems.ForEach(s => s.Pid = item.gid);
- return db.Insertable(qsItemIpiItems)
- .ExecuteCommand();
- });
+ return db.Insertable(qsItemIpiItems)
+ .ExecuteCommand();
+ });
item.Items = getQSItems(item.gid, null);
//娌℃湁涓婁笅闄愮殑妫�楠岄」鐩嚜鍔ㄧ洏鐐逛负鍚堟牸
@@ -328,8 +330,8 @@
if (count == passCount) result = 1;
- var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
- db =>
+ var useTransactionWithOracle =
+ SqlSugarHelper.UseTransactionWithOracle(db =>
{
var commit = 0;
commit += db.Updateable<QsItemIpiItem>()
@@ -364,8 +366,8 @@
//鍚堟牸鐨勬楠岀粨鏋滅瓑浜庢�绘楠屾暟瑙嗕负鍚堟牸
if (icount == passCount) result = 1;
- useTransactionWithOracle += SqlSugarHelper.UseTransactionWithOracle(
- db =>
+ useTransactionWithOracle +=
+ SqlSugarHelper.UseTransactionWithOracle(db =>
{
return db.Updateable<QsItemIpiReq>()
.SetColumns(s => s.IsPass == result)
@@ -481,21 +483,23 @@
try
{
// 瀹氫箟杈撳嚭鍙傛暟
- var outputResult = new SugarParameter("o_Result", null, DbType.Int32, ParameterDirection.Output,
+ var outputResult = new SugarParameter("o_Result", null,
+ DbType.Int32, ParameterDirection.Output,
4000);
- var outputMessage = new SugarParameter("o_Msg", null, DbType.String, ParameterDirection.Output, 4000);
+ var outputMessage = new SugarParameter("o_Msg", null, DbType.String,
+ ParameterDirection.Output, 4000);
// 瀹氫箟杈撳叆鍙傛暟
var parameters = new List<SugarParameter>
- {
-
- new("p_Id", item.gid, DbType.Int32,ParameterDirection.Input),
- new("p_Flag", 1, DbType.Int32,ParameterDirection.Input),
- new("p_User", item.userNo, DbType.String, ParameterDirection.Input),
- outputResult,
- outputMessage
- };
+ {
+ new("p_Id", item.gid, DbType.Int32, ParameterDirection.Input),
+ new("p_Flag", 1, DbType.Int32, ParameterDirection.Input),
+ new("p_User", item.userNo, DbType.String,
+ ParameterDirection.Input),
+ outputResult,
+ outputMessage
+ };
var db = SqlSugarHelper.GetInstance();
@@ -508,8 +512,8 @@
var resultValue = outputResult.Value?.ToString();
var messageValue = outputMessage.Value?.ToString();
- if ("1".Equals(resultValue)) { throw new Exception(messageValue); }
- if ("0".Equals(resultValue)) { throw new Exception(messageValue); }
+ if ("1".Equals(resultValue)) throw new Exception(messageValue);
+ if ("0".Equals(resultValue)) throw new Exception(messageValue);
return true;
}
diff --git a/MES.Service/service/QC/SuspendService.cs b/MES.Service/service/QC/SuspendService.cs
index ce48de9..57dfc29 100644
--- a/MES.Service/service/QC/SuspendService.cs
+++ b/MES.Service/service/QC/SuspendService.cs
@@ -13,12 +13,12 @@
var db = SqlSugarHelper.GetInstance();
//return db.Queryable<SysDepartment>().ToList();
return db
- .Queryable<Womdaa, MesLine, QsQaItemXj, SysDepartment>(
- (a, b, c, d) =>
- new JoinQueryInfos(JoinType.Left,
- a.Daa002 == b.Id.ToString(),
- JoinType.Inner, a.Daa001 == c.BillNo,
- JoinType.Left, b.Departmentcode == d.Departmentcode))
+ .Queryable<Womdaa, MesLine, QsQaItemXj,
+ SysDepartment>((a, b, c, d) =>
+ new JoinQueryInfos(JoinType.Left,
+ a.Daa002 == b.Id.ToString(),
+ JoinType.Inner, a.Daa001 == c.BillNo,
+ JoinType.Left, b.Departmentcode == d.Departmentcode))
.Where((a, b, c, d) => b.LineName != null &&
statusArray.Contains(a.Daa018))
.GroupBy((a, b, c, d) => new
@@ -35,11 +35,10 @@
public List<MesLine> GetLines(string deptCode)
{
var db = SqlSugarHelper.GetInstance();
- var mesLines = db.Queryable<Womdaa, MesLine, QsQaItemXj>(
- (a, b, c) =>
- new JoinQueryInfos(JoinType.Left,
- a.Daa002 == b.Id.ToString(),
- JoinType.Inner, a.Daa001 == c.BillNo))
+ var mesLines = db.Queryable<Womdaa, MesLine, QsQaItemXj>((a, b, c) =>
+ new JoinQueryInfos(JoinType.Left,
+ a.Daa002 == b.Id.ToString(),
+ JoinType.Inner, a.Daa001 == c.BillNo))
.Where((a, b, c) => b.LineName != null &&
statusArray.Contains(a.Daa018)
&& b.Departmentcode == deptCode)
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 5bac98e..145d6cc 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -164,14 +164,15 @@
{
var db = SqlSugarHelper.GetInstance();
- var count = db.Queryable<MesQa>().Where(s => s.QsType == "2" && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
+ var count = db.Queryable<MesQa>().Where(s =>
+ s.QsType == "2" && s.ItemNo == itemNo && s.Fsubmit == 1).Count();
if (count <= 0) return new List<QsQaItemXj01>();
return db
.Queryable<MesQualityStandard>()
- .Where(b => b.QsType == "2" && b.ItemNo == itemNo).Select(
- b => new QsQaItemXj01
+ .Where(b => b.QsType == "2" && b.ItemNo == itemNo).Select(b =>
+ new QsQaItemXj01
{
ProjName = b.ProjName,
ItemMod = b.ItemMod,
@@ -399,8 +400,8 @@
if (count == passCount) result = 1;
- var useTransactionWithOracle = SqlSugarHelper.UseTransactionWithOracle(
- db =>
+ var useTransactionWithOracle =
+ SqlSugarHelper.UseTransactionWithOracle(db =>
{
var commit = 0;
commit += db.Updateable<QsQaItemXj01>()
diff --git a/MES.Service/service/Warehouse/MesDepotSectionsManager.cs b/MES.Service/service/Warehouse/MesDepotSectionsManager.cs
index 0fbb744..7a944c6 100644
--- a/MES.Service/service/Warehouse/MesDepotSectionsManager.cs
+++ b/MES.Service/service/Warehouse/MesDepotSectionsManager.cs
@@ -28,9 +28,9 @@
if (string.IsNullOrEmpty(query.sectionCode))
throw new Exception("璇锋壂搴撲綅鏉＄爜!");
- var mesDepotSections = Db.Queryable<MesDepotSections, MesDepots>(
- (a, b) =>
- new JoinQueryInfos(JoinType.Inner, a.DepotId == b.DepotId))
+ var mesDepotSections = Db
+ .Queryable<MesDepotSections, MesDepots>((a, b) =>
+ new JoinQueryInfos(JoinType.Inner, a.DepotId == b.DepotId))
.Where((a, b) => a.DepotSectionCode == query.sectionCode)
.Select((a, b) => new MesDepotSections
{
@@ -51,10 +51,10 @@
if (string.IsNullOrEmpty(entity.sectionCode))
throw new Exception("璇锋壂搴撲綅鏉＄爜!");
- var mesDepotSections = Db.Queryable<MesDepotSections, MesDepots>(
- (a, b) =>
- new JoinQueryInfos(JoinType.Inner,
- a.Zuid.ToString() == b.Zuid))
+ var mesDepotSections = Db
+ .Queryable<MesDepotSections, MesDepots>((a, b) =>
+ new JoinQueryInfos(JoinType.Inner,
+ a.Zuid.ToString() == b.Zuid))
.Where((a, b) => a.DepotSectionCode == entity.sectionCode)
.First();
if (mesDepotSections == null)
diff --git a/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs b/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
index 73d3732..205cfea 100644
--- a/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
@@ -21,8 +21,8 @@
public List<MesInvItemArnDetail> GetDetails(WarehouseQuery query)
{
// 鏌ヨ
- return Db.Queryable<MesInvItemArnDetail, MesItems, MesUnit>(
- (c, t, u) => new object[]
+ return Db.Queryable<MesInvItemArnDetail, MesItems, MesUnit>((c, t, u) =>
+ new object[]
{
JoinType.Left,
c.ItemNo == t.ItemNo && c.Company == t.Company &&
@@ -60,17 +60,17 @@
// 鏌ヨ
var result = Db
.Queryable<MesQaItemsDetect01, MesInvItemArn, MesInvItemArnDetail,
- MesItems, MesUnit, MesQaItemsDetectDetail5>(
- (a, d, b, c, t, z) => new object[]
- {
- JoinType.Inner, d.BillNo == a.LotNo,
- JoinType.Inner, d.Id == b.Mid && b.ItemNo == a.ItemNo,
- JoinType.Inner,
- a.ItemNo == c.ItemNo && a.Company == c.Company &&
- a.Factory == c.Factory,
- JoinType.Inner, c.Fpurchaseunitid == t.Id.ToString(),
- JoinType.Inner, z.ReleaseNo == a.ReleaseNo
- })
+ MesItems, MesUnit,
+ MesQaItemsDetectDetail5>((a, d, b, c, t, z) => new object[]
+ {
+ JoinType.Inner, d.BillNo == a.LotNo,
+ JoinType.Inner, d.Id == b.Mid && b.ItemNo == a.ItemNo,
+ JoinType.Inner,
+ a.ItemNo == c.ItemNo && a.Company == c.Company &&
+ a.Factory == c.Factory,
+ JoinType.Inner, c.Fpurchaseunitid == t.Id.ToString(),
+ JoinType.Inner, z.ReleaseNo == a.ReleaseNo
+ })
.Where((a, d, b, c, t, z) => a.FngHandle == "閫�璐�" &&
z.FcheckResu == "涓嶅悎鏍�" &&
query.ItemArnDetailIds.Contains(b.Id))
diff --git a/MES.Service/service/Warehouse/MesInvItemArnManager.cs b/MES.Service/service/Warehouse/MesInvItemArnManager.cs
index c382c5c..73f36aa 100644
--- a/MES.Service/service/Warehouse/MesInvItemArnManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemArnManager.cs
@@ -13,8 +13,9 @@
public List<MesInvItemArn> GetPagedResults(WarehouseQuery query)
{
// 鏌ヨ骞跺垎椤�
- var result = Db.Queryable<MesInvItemArn, MesDepots, MesSupplier>(
- (a, d, f) => new object[]
+ var result = Db
+ .Queryable<MesInvItemArn, MesDepots, MesSupplier>((a, d, f) =>
+ new object[]
{
JoinType.Left,
a.DepotsCode == d.DepotCode && d.Factory == a.Factory &&
diff --git a/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs b/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
index 48f5973..a0f092d 100644
--- a/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -117,8 +117,9 @@
public List<MesInvItemInCDetails> GetInvItemInCDetails(decimal? pid)
{
- var result = Db.Queryable<MesInvItemInCDetails, MesItems, MesUnit>(
- (g, c, d) => new JoinQueryInfos(
+ var result = Db
+ .Queryable<MesInvItemInCDetails, MesItems, MesUnit>((g, c, d) =>
+ new JoinQueryInfos(
JoinType.Left,
g.ItemNo == c.ItemNo && g.Company == c.Company &&
g.Factory == c.Factory, JoinType.Inner,
@@ -231,18 +232,17 @@
if (invItemIns.Status == 1) throw new Exception("鍏ュ簱鍗曞凡瀹℃牳锛屼笉鑳介噸澶嶆帹閫�");
var materials = Db.Queryable<MesInvItemInCItems, MesItems, MesUnit,
- MesInvItemArnDetail>(
- (g, c, d, a) => new JoinQueryInfos(
- JoinType.Left,
- g.ItemNo == c.ItemNo && g.Company == c.Company &&
- g.Factory == c.Factory, JoinType.Inner,
- d.Id == Convert.ToDecimal(c.ItemUnit),
- JoinType.Inner,
- a.Ebeln == g.WorkNo && a.WorkLine == g.EbelnLineNo
- && g.CbillNo == a.CbillNo
- )
- ).Where((g, c, d, a) => g.BillNo == billNo).Select<Material>(
- (g, c, d, a) => new Material
+ MesInvItemArnDetail>((g, c, d, a) => new JoinQueryInfos(
+ JoinType.Left,
+ g.ItemNo == c.ItemNo && g.Company == c.Company &&
+ g.Factory == c.Factory, JoinType.Inner,
+ d.Id == Convert.ToDecimal(c.ItemUnit),
+ JoinType.Inner,
+ a.Ebeln == g.WorkNo && a.WorkLine == g.EbelnLineNo
+ && g.CbillNo == a.CbillNo
+ )
+ ).Where((g, c, d, a) => g.BillNo == billNo)
+ .Select<Material>((g, c, d, a) => new Material
{
FstockId = g.DepotCode,
FuintId = d.Fnumber,
diff --git a/MES.Service/service/Warehouse/MesInvItemMovesManager.cs b/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
index ce0d8ce..31c8488 100644
--- a/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
@@ -50,8 +50,9 @@
var iDepotCode = itemMoveQuery.InvDepotsCode;
// 楠岃瘉搴撳尯涓庝粨搴�
- var depotValidationQuery = Db.Queryable<MesDepotSections, MesDepots>(
- (a, b) => new JoinQueryInfos(
+ var depotValidationQuery = Db
+ .Queryable<MesDepotSections, MesDepots>((a, b) =>
+ new JoinQueryInfos(
JoinType.Inner, a.Zuid.ToString() == b.Zuid))
.Where((a, b) => a.DepotSectionCode == query.sectionCode &&
b.DepotCode == iDepotCode)
@@ -180,13 +181,14 @@
private List<MesInvItemMovesCDetails> GetItemMovesCDetails(
WarehouseQuery query)
{
- return Db.Queryable<MesInvItemMovesCDetails, MesItems, MesSupplier>(
- (b, c, f) => new JoinQueryInfos(
- JoinType.Left,
- b.ItemNo == c.ItemNo && b.Company == c.Company &&
- b.Factory == c.Factory,
- JoinType.Left, b.SuppNo == f.SuppNo
- ))
+ return Db
+ .Queryable<MesInvItemMovesCDetails, MesItems,
+ MesSupplier>((b, c, f) => new JoinQueryInfos(
+ JoinType.Left,
+ b.ItemNo == c.ItemNo && b.Company == c.Company &&
+ b.Factory == c.Factory,
+ JoinType.Left, b.SuppNo == f.SuppNo
+ ))
.Where((b, c, f) => b.ItemMoveId == query.id)
.Select((b, c, f) => new MesInvItemMovesCDetails
{
@@ -230,9 +232,9 @@
if (mesInvItemMoves == null)
throw new Exception("鍑哄簱鍗� " + query.billNo + "涓嶅瓨鍦紝璇风‘璁わ紒");
- var count = Db.Queryable<MesInvItemMoves, MesInvItemMovesCDetails>(
- (a, b) =>
- new JoinQueryInfos(JoinType.Inner, a.Id == b.ItemMoveId))
+ var count = Db
+ .Queryable<MesInvItemMoves, MesInvItemMovesCDetails>((a, b) =>
+ new JoinQueryInfos(JoinType.Inner, a.Id == b.ItemMoveId))
.Where((a, b) => b.ItemBarcode == query.barcode
&& a.TransactionNo == TransctionNo &&
SqlFunc.IsNull(a.Status, 0) == 0).Count();
diff --git a/MES.Service/service/Warehouse/MesInvItemOutCDetailsManager.cs b/MES.Service/service/Warehouse/MesInvItemOutCDetailsManager.cs
index 6425341..8f28fe9 100644
--- a/MES.Service/service/Warehouse/MesInvItemOutCDetailsManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemOutCDetailsManager.cs
@@ -95,10 +95,10 @@
var entity = Db
- .Queryable<MesInvItemOutCDetails, MesInvItemOuts, MesItems>(
- (a, b, c) =>
- new JoinQueryInfos(JoinType.Left, a.ItemOutId == b.Id,
- JoinType.Left, a.ItemNo == c.ItemNo))
+ .Queryable<MesInvItemOutCDetails, MesInvItemOuts, MesItems>((a, b,
+ c) =>
+ new JoinQueryInfos(JoinType.Left, a.ItemOutId == b.Id,
+ JoinType.Left, a.ItemNo == c.ItemNo))
.Where((a, b, c) => a.ItemBarcode == query.barcode)
.Select((a, b, c) => new MesInvItemOutCDetails
{
diff --git a/MES.Service/service/Warehouse/MesInvItemOutsManager.cs b/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
index 95cc7b2..86cc440 100644
--- a/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
@@ -68,11 +68,12 @@
private List<MesInvItemOutItems> getProductionItemsList(
WarehouseQuery query)
{
- return Db.Queryable<MesInvItemOutItems, MesItems, MesDepTaskInfo>(
- (c, s, f) => new JoinQueryInfos(
- JoinType.Inner, c.ItemNo == s.ItemNo,
- JoinType.Left, f.TaskNo == c.TaskNo && f.ItemNo == c.ItemNo
- ))
+ return Db
+ .Queryable<MesInvItemOutItems, MesItems,
+ MesDepTaskInfo>((c, s, f) => new JoinQueryInfos(
+ JoinType.Inner, c.ItemNo == s.ItemNo,
+ JoinType.Left, f.TaskNo == c.TaskNo && f.ItemNo == c.ItemNo
+ ))
.Where((c, s, f) => c.ItemOutId == query.id)
.OrderBy(c => c.Id)
.Select((c, s, f) => new MesInvItemOutItems
@@ -97,8 +98,8 @@
WarehouseQuery query)
{
return Db
- .Queryable<MesInvItemOutCDetails, MesItems, MesDepots>(
- (b, c, d) => new JoinQueryInfos(
+ .Queryable<MesInvItemOutCDetails, MesItems, MesDepots>((b, c, d) =>
+ new JoinQueryInfos(
JoinType.Left,
b.ItemNo == c.ItemNo && b.Company == c.Company &&
b.Factory == c.Factory,
@@ -403,8 +404,8 @@
foreach (var j in itemOutItems)
{
// 鏍￠獙瀛愯〃瀵瑰簲閲囪喘璁㈠崟鐨勪緵搴斿晢缂栫爜
- var c_SuppNo = Db.Queryable<MesRohIn, MesSupplier>(
- (roh, supp) => new JoinQueryInfos(
+ var c_SuppNo = Db.Queryable<MesRohIn, MesSupplier>((roh, supp) =>
+ new JoinQueryInfos(
JoinType.Left,
roh.Supplier == supp.Id.ToString()
))
@@ -534,17 +535,16 @@
public List<MesInvItemOutCDetails> GetScanBarcode(WarehouseQuery query)
{
return Db.Queryable<MesInvItemOutCDetails, MesInvItemBarcodes, MesItems,
- MesDepots>(
- (b, bar, c, d) => new
- JoinQueryInfos(
- JoinType.Left, b.ItemBarcode == bar.ItemBarcode,
- JoinType.Left, b.ItemNo == c.ItemNo &&
- b.Company == c.Company &&
- b.Factory == c.Factory,
- JoinType.Left, b.DepotCode == d.DepotCode &&
- b.Company == d.Company &&
- b.Factory == d.Factory
- ))
+ MesDepots>((b, bar, c, d) => new
+ JoinQueryInfos(
+ JoinType.Left, b.ItemBarcode == bar.ItemBarcode,
+ JoinType.Left, b.ItemNo == c.ItemNo &&
+ b.Company == c.Company &&
+ b.Factory == c.Factory,
+ JoinType.Left, b.DepotCode == d.DepotCode &&
+ b.Company == d.Company &&
+ b.Factory == d.Factory
+ ))
.Where((b, bar, c, d) => b.ItemOutId == query.id)
.Select((b, bar, c, d) => new MesInvItemOutCDetails
{
@@ -880,11 +880,11 @@
if (womcaa == null) throw new Exception("浠诲姟鍗曞彿涓嶅瓨鍦�");
- var Departmentcode = Db.Queryable<SysDepartment, MesInvItemOuts>(
- (a, b) =>
- new JoinQueryInfos(JoinType.Left,
- a.Departmentname == b.OutPart
- )).Where((a, b) =>
+ var Departmentcode = Db
+ .Queryable<SysDepartment, MesInvItemOuts>((a, b) =>
+ new JoinQueryInfos(JoinType.Left,
+ a.Departmentname == b.OutPart
+ )).Where((a, b) =>
b.OutPart == mesInvItemOuts.OutPart &&
b.ItemOutNo == queryBillNo).Select(a => a.Departmentcode)
.First();
@@ -896,14 +896,14 @@
if (mesInvItemOuts.Status == 1) throw new Exception("棰嗘枡鍗曞凡瀹℃牳锛屼笉鑳介噸澶嶆帹閫�");
var C_OUT_ITEMS = Db
- .Queryable<MesInvItemOutItems, Womdab, Womdaa, Womcaa, Womcab>(
- (c, b, d, e, f) =>
- new JoinQueryInfos(
- JoinType.Left, b.Id == c.ItemDabid,
- JoinType.Left, d.Id == b.Pid,
- JoinType.Left, e.Caa001 == d.Daa021,
- JoinType.Left, f.Eid == e.Erpid
- ))
+ .Queryable<MesInvItemOutItems, Womdab, Womdaa, Womcaa, Womcab>((c,
+ b, d, e, f) =>
+ new JoinQueryInfos(
+ JoinType.Left, b.Id == c.ItemDabid,
+ JoinType.Left, d.Id == b.Pid,
+ JoinType.Left, e.Caa001 == d.Daa021,
+ JoinType.Left, f.Eid == e.Erpid
+ ))
.Where((c, b, d, e, f) => c.ItemOutId == mesInvItemOuts.Id)
.Select((c, b, d, e, f) => new
{
@@ -936,8 +936,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/Warehouse/OpeningReceiptServer.cs b/MES.Service/service/Warehouse/OpeningReceiptServer.cs
index d525417..161307e 100644
--- a/MES.Service/service/Warehouse/OpeningReceiptServer.cs
+++ b/MES.Service/service/Warehouse/OpeningReceiptServer.cs
@@ -205,8 +205,9 @@
private int CheckBarcodeAlreadyReceived(string itemBarcode)
{
// Check if the barcode is already received
- return Db.Queryable<MesInvItemIns, MesInvItemInCDetails>(
- (ins, details) => new JoinQueryInfos(JoinType.Inner,
+ return Db
+ .Queryable<MesInvItemIns, MesInvItemInCDetails>((ins, details) =>
+ new JoinQueryInfos(JoinType.Inner,
ins.Id == details.ItemInId))
.Where((ins, details) => details.ItemBarcode == itemBarcode)
.Count();
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index a569556..5c0616d 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -1,9 +1,7 @@
-锘縰sing Dm;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
-using System.Net.NetworkInformation;
namespace MES.Service.service;
@@ -24,7 +22,8 @@
public bool Save(ErpWOM wom)
{
var womErpCaa = wom.ErpCaa;
- var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa, wom.ErpCabs[0].FXSHTBH, wom.ErpCabs[0].F_ZJXF_HSDJ);
+ var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa, wom.ErpCabs[0].FXSHTBH,
+ wom.ErpCabs[0].F_ZJXF_HSDJ);
var mesWomcabs =
MapErpCABtoWomcab(wom.ErpCabs);
@@ -46,16 +45,14 @@
}
}) > 0;
}
- private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa, List<Womcab> mesWomcabs)
+
+ private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,
+ List<Womcab> mesWomcabs)
{
- if (mesWomcaa.Id != null)
- {
- base.DeleteById(mesWomcaa.Id);
- }
+ if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
if (mesWomcabs.Count > 0)
- {
- db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
- }
+ db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid)
+ .ExecuteCommand();
var orUpdate = base.Insert(mesWomcaa);
var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
db.Ado.CommitTran();
@@ -67,34 +64,34 @@
var outParam1 = new SugarParameter("c_Result", null, true);
var outParam2 = new SugarParameter("C_MSG", null, true);
// 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
- Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;", inputParam1, outParam1, outParam2);
+ Db.Ado.ExecuteCommand(
+ "BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",
+ inputParam1, outParam1, outParam2);
// 鑾峰彇杈撳嚭鍙傛暟鐨勫��
- int result = int.Parse((string)outParam1.Value);
- string message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
+ var result = int.Parse((string)outParam1.Value);
+ var message = outParam2.Value == DBNull.Value
+ ? string.Empty
+ : (string)outParam2.Value;
if (result == 1)
- {
//瀛樺偍杩囩▼澶辫触鍒欎簨鍔¤繘琛屽洖婊�
//db.Ado.RollbackTran();
throw new Exception(message);
- }
// 鎻愪氦浜嬪姟
//db.Ado.CommitTran();
return true;
}
+
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
- private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabs)
+ private bool SaveOrUpdateData(SqlSugarScope db, Womcaa mesWomcaa,
+ List<Womcab> mesWomcabs)
{
- if (mesWomcaa.Id != null)
- {
- base.DeleteById(mesWomcaa.Id);
- }
+ if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
- if (mesWomcabs.Count > 0)
- {
- db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
- }
+ if (mesWomcabs.Count > 0)
+ db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid)
+ .ExecuteCommand();
var orUpdate = base.Insert(mesWomcaa);
var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
@@ -107,36 +104,41 @@
var outParam1 = new SugarParameter("c_Result", null, true);
var outParam2 = new SugarParameter("C_MSG", null, true);
// 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
- Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;", inputParam1, outParam1, outParam2);
+ Db.Ado.ExecuteCommand(
+ "BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",
+ inputParam1, outParam1, outParam2);
// 鑾峰彇杈撳嚭鍙傛暟鐨勫��
- int result = int.Parse((string)outParam1.Value);
- string message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
+ var result = int.Parse((string)outParam1.Value);
+ var message = outParam2.Value == DBNull.Value
+ ? string.Empty
+ : (string)outParam2.Value;
if (result == 1)
- {
//瀛樺偍杩囩▼澶辫触鍒欎簨鍔¤繘琛屽洖婊�
//db.Ado.RollbackTran();
throw new Exception(message);
- }
// 鎻愪氦浜嬪姟
//db.Ado.CommitTran();
return true;
}
+
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
- private bool DeleteData(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabs)
+ private bool DeleteData(SqlSugarScope db, Womcaa mesWomcaa,
+ List<Womcab> mesWomcabs)
{
var decimals = mesWomcabs.Select(s => s.Id).ToArray();
var update = base.DeleteById(mesWomcaa.Id);
- var insertOrUpdate = db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;
+ var insertOrUpdate =
+ db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;
if (update && insertOrUpdate) return true;
throw new NotImplementedException("鏇存柊澶辫触");
}
- private Womcaa MapErpCAAtoWomcaa(ErpCAA dto,string? fxshtbh,string? hsdj)
+ private Womcaa MapErpCAAtoWomcaa(ErpCAA dto, string? fxshtbh, string? hsdj)
{
- string jabs="0";
+ var jabs = "0";
var entity = new Womcaa
{
@@ -187,19 +189,15 @@
TrustOrg = dto.erP_WTZZ,
TbTime = DateTime.Now,
JaBs = "0",
- SupplierId=dto.SupplierId,
- FinishedProduct=dto.FinishedProduct,
- F_ZJXF_HSDJ= hsdj
+ SupplierId = dto.SupplierId,
+ FinishedProduct = dto.FinishedProduct,
+ F_ZJXF_HSDJ = hsdj
};
if (dto.Type == "5")
- {
entity.IsXg = 1;
- }
else
- {
entity.IsXg = 0;
- }
if (dto.FStatus == "6" || dto.FStatus == "7")
{
@@ -233,8 +231,8 @@
Pid = Convert.ToDecimal(dto.FID),
Eid = Convert.ToDecimal(dto.FID),
PositionNo = dto.FPositionNO,
- IssuingOrganization=dto.FSupplyOrg,
- SupplyOrganization=dto.FChildSupplyOrgId,
+ IssuingOrganization = dto.FSupplyOrg,
+ SupplyOrganization = dto.FChildSupplyOrgId,
OwnerId = dto.FOwnerID,
Mtono = dto.FMTONO,
Lot = dto.FLot,
@@ -245,9 +243,9 @@
Denominator = Convert.ToDecimal(dto.FDenominator),
SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty),
SCRAPRATE = Convert.ToDecimal(dto.FScrapRate),
- SalesOrder=dto.FXSHTBH,
- F_ZJXF_YHRQ=dto.F_ZJXF_YHRQ,
- ProcNo=dto.F_ZJXF_SSGX
+ SalesOrder = dto.FXSHTBH,
+ F_ZJXF_YHRQ = dto.F_ZJXF_YHRQ,
+ ProcNo = dto.F_ZJXF_SSGX
};
var entity = Db.Queryable<Womcab>()
@@ -256,6 +254,7 @@
womcabList.Add(womcab);
}
+
return womcabList;
}
}
\ No newline at end of file
diff --git a/MES.Service/service/WomcaaWWManager.cs b/MES.Service/service/WomcaaWWManager.cs
index afc91ae..2f06bd0 100644
--- a/MES.Service/service/WomcaaWWManager.cs
+++ b/MES.Service/service/WomcaaWWManager.cs
@@ -2,8 +2,6 @@
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
-using System;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
namespace MES.Service.service;
@@ -15,8 +13,8 @@
private readonly WomcabManager _womcabWWManager = new();
private decimal?[] decimals;
- private bool update;
private bool insertOrUpdate;
+ private bool update;
public bool SaveList(List<ErpWOM> rohIns)
{
@@ -39,7 +37,9 @@
case "1":
case "2":
case "4":
- return SaveOrUpdateDataWw(db, mesWomcaa, mesWomcabs) ? 1 : 0;
+ return SaveOrUpdateDataWw(db, mesWomcaa, mesWomcabs)
+ ? 1
+ : 0;
case "5":
return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0;
default:
@@ -48,16 +48,14 @@
}
}) > 0;
}
- private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa, List<Womcab> mesWomcabs)
+
+ private bool UpdateData(SqlSugarScope db, Womcaa mesWomcaa,
+ List<Womcab> mesWomcabs)
{
- if (mesWomcaa.Id != null)
- {
- base.DeleteById(mesWomcaa.Id);
- }
+ if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
if (mesWomcabs.Count > 0)
- {
- db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
- }
+ db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid)
+ .ExecuteCommand();
var orUpdate = base.Insert(mesWomcaa);
var baOrUpdate = _womcabWWManager.InsertRange(mesWomcabs);
db.Ado.CommitTran();
@@ -69,33 +67,33 @@
var outParam1 = new SugarParameter("c_Result", null, true);
var outParam2 = new SugarParameter("C_MSG", null, true);
// 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
- Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;", inputParam1, outParam1, outParam2);
+ Db.Ado.ExecuteCommand(
+ "BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",
+ inputParam1, outParam1, outParam2);
// 鑾峰彇杈撳嚭鍙傛暟鐨勫��
- int result = int.Parse((string)outParam1.Value);
- string message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
+ var result = int.Parse((string)outParam1.Value);
+ var message = outParam2.Value == DBNull.Value
+ ? string.Empty
+ : (string)outParam2.Value;
if (result == 1)
- {
//瀛樺偍杩囩▼澶辫触鍒欎簨鍔¤繘琛屽洖婊�
//db.Ado.RollbackTran();
throw new Exception(message);
- }
// 鎻愪氦浜嬪姟
//db.Ado.CommitTran();
return true;
}
+
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
- private bool SaveOrUpdateDataWw(SqlSugarScope db, Womcaa mesWomcaa, List<Womcab> mesWomcabss)
+ private bool SaveOrUpdateDataWw(SqlSugarScope db, Womcaa mesWomcaa,
+ List<Womcab> mesWomcabss)
{
- if (mesWomcaa.Id != null)
- {
- base.DeleteById(mesWomcaa.Id);
- }
+ if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
if (mesWomcabss.Count > 0)
- {
- db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
- }
+ db.Deleteable<Womcab>().Where(s => s.Eid == mesWomcaa.Erpid)
+ .ExecuteCommand();
var orUpdate = base.Insert(mesWomcaa);
var baOrUpdate = _womcabWWManager.InsertRange(mesWomcabss);
db.Ado.CommitTran();
@@ -107,16 +105,18 @@
var outParam1 = new SugarParameter("c_Result", null, true);
var outParam2 = new SugarParameter("C_MSG", null, true);
// 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
- Db.Ado.ExecuteCommand("BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;", inputParam1, outParam1, outParam2);
+ Db.Ado.ExecuteCommand(
+ "BEGIN PRC_UPDATE_DAA(:P_WORK_NO,:c_Result,:C_MSG); END;",
+ inputParam1, outParam1, outParam2);
// 鑾峰彇杈撳嚭鍙傛暟鐨勫��
- int result = int.Parse((string)outParam1.Value);
- string message = outParam2.Value == DBNull.Value ? string.Empty : (string)outParam2.Value;
+ var result = int.Parse((string)outParam1.Value);
+ var message = outParam2.Value == DBNull.Value
+ ? string.Empty
+ : (string)outParam2.Value;
if (result == 1)
- {
//瀛樺偍杩囩▼澶辫触鍒欎簨鍔¤繘琛屽洖婊�
//db.Ado.RollbackTran();
throw new Exception(message);
- }
// 鎻愪氦浜嬪姟
//db.Ado.CommitTran();
return true;
@@ -125,19 +125,22 @@
throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
}
- private bool DeleteData(SqlSugarScope db, Womcaa mesWomcaa,List<Womcab> mesWomcabs)
+ private bool DeleteData(SqlSugarScope db, Womcaa mesWomcaa,
+ List<Womcab> mesWomcabs)
{
if (mesWomcaa.Id != null)
{
decimals = mesWomcabs.Select(s => s.Id).ToArray();
update = base.DeleteById(mesWomcaa.Id);
- insertOrUpdate = db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;
+ insertOrUpdate =
+ db.Deleteable<Womcab>().In(decimals).ExecuteCommand() > 0;
}
else
{
update = true;
insertOrUpdate = true;
}
+
if (update && insertOrUpdate) return true;
throw new NotImplementedException("鏇存柊澶辫触");
}
@@ -202,13 +205,9 @@
FinishedProduct = dto.FinishedProduct
};
if (dto.Type == "5")
- {
entity.IsXg = 1;
- }
else
- {
entity.IsXg = 0;
- }
if (dto.FStatus == "6" || dto.FStatus == "7")
{
@@ -253,10 +252,11 @@
Denominator = Convert.ToDecimal(dto.FDenominator),
SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty),
SCRAPRATE = Convert.ToDecimal(dto.FScrapRate),
- SalesOrder = dto.F_WWC_TEXT,
+ SalesOrder = dto.F_WWC_TEXT
};
- var entity = Db.Queryable<Womcab>().Where(s => s.Erpid == womcab.Erpid).Single();
+ var entity = Db.Queryable<Womcab>()
+ .Where(s => s.Erpid == womcab.Erpid).Single();
if (entity != null) womcab.Id = entity.Id;
womcabList.Add(womcab);
diff --git a/MESApplication/Controllers/Base/LoginController.cs b/MESApplication/Controllers/Base/LoginController.cs
index 552fa75..aede14c 100644
--- a/MESApplication/Controllers/Base/LoginController.cs
+++ b/MESApplication/Controllers/Base/LoginController.cs
@@ -3,7 +3,6 @@
using MES.Service.service;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
-using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace MESApplication.Controllers.Base;
@@ -106,5 +105,4 @@
return ResponseResult.ResponseError(ex);
}
}
-
}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs b/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs
index eead4df..c55bfbe 100644
--- a/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs
+++ b/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs
@@ -20,7 +20,8 @@
private readonly string TableName = "MES_DELIVERY_NOTE_BARCODE";
- private readonly string URL = "http://localhost:10054/api/MesDeliveryNoteBarcode/";
+ private readonly string URL =
+ "http://localhost:10054/api/MesDeliveryNoteBarcode/";
[HttpPost("Save")]
public ResponseResult Save(ErpBarcode barcode)
diff --git a/MESApplication/Controllers/BasicData/MesDeliveryNoteDetails.cs b/MESApplication/Controllers/BasicData/MesDeliveryNoteDetails.cs
index 89c2bbb..c7905dc 100644
--- a/MESApplication/Controllers/BasicData/MesDeliveryNoteDetails.cs
+++ b/MESApplication/Controllers/BasicData/MesDeliveryNoteDetails.cs
@@ -117,7 +117,8 @@
/// </summary>
/// <returns></returns>
[HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] MesDeliveryNoteDetails data)
+ public ResponseResult InsertReturnIdentity(
+ [FromBody] MesDeliveryNoteDetails data)
{
try
{
diff --git a/MESApplication/Controllers/BasicData/OrganizeController.cs b/MESApplication/Controllers/BasicData/OrganizeController.cs
index 9496ffa..a587337 100644
--- a/MESApplication/Controllers/BasicData/OrganizeController.cs
+++ b/MESApplication/Controllers/BasicData/OrganizeController.cs
@@ -1,266 +1,259 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Dynamic;
+锘縰sing System.Dynamic;
+using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.util;
-using MES.Service.Dto.webApi;
-using MES.Service.service.BasicData;
+using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
-namespace MESApplication.Controllers
+namespace MESApplication.Controllers;
+
+[ApiController]
+[Route("api/[controller]")]
+public class OrganizeController : ControllerBase
{
- [ApiController]
- [Route("api/[controller]")]
- public class OrganizeController : ControllerBase
+ private readonly MessageCenterManager _manager = new();
+
+ private readonly OrganizeManager m = new();
+
+ private readonly string METHOD = "POST";
+
+ private readonly string TableName = "Organize";
+
+ private readonly string URL = "http://localhost:10054/api/Organize/";
+
+ [HttpPost("Save")]
+ public ResponseResult Save(ErpOrganize unit)
{
- private readonly MessageCenterManager _manager = new();
-
- private readonly OrganizeManager m = new();
-
- private readonly string METHOD = "POST";
-
- private readonly string TableName = "Organize";
-
- private readonly string URL = "http://localhost:10054/api/Organize/";
-
- [HttpPost("Save")]
- public ResponseResult Save(ErpOrganize unit)
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Save";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(unit);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
{
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "Save";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(unit);
- entity.Status = 1;
- entity.CreateBy = "PL017";
- try
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.Save(unit);
+ resultInfos.tbBillList = save;
+
+ entity.Result = 0;
+ if (save) entity.Result = 1;
+
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
{
- dynamic resultInfos = new ExpandoObject();
- var save = m.Save(unit);
- resultInfos.tbBillList = save;
-
- entity.Result = 0;
- if (save) entity.Result = 1;
-
- entity.DealWith = 1;
- _manager.save(entity);
-
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- entity.Result = 0;
-
- entity.DealWith = 0;
-
- entity.ResultData = ex.Message;
-
- _manager.save(entity);
-
- return ResponseResult.ResponseError(ex);
- }
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
}
-
- [HttpPost("SaveList")]
- public ResponseResult SaveList(List<ErpOrganize> units)
+ catch (Exception ex)
{
- 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;
- entity.Result = 0;
- if (save) entity.Result = 1;
+ entity.DealWith = 0;
- entity.DealWith = 1;
- _manager.save(entity);
+ entity.ResultData = ex.Message;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- entity.Result = 0;
+ _manager.save(entity);
- entity.DealWith = 0;
-
- entity.ResultData = ex.Message;
-
- _manager.save(entity);
-
- return ResponseResult.ResponseError(ex);
- }
- }
- // private OrganizeManager m = new OrganizeManager();
-
-
- /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
-
- /// <summary>
- /// 鑾峰彇鎵�鏈�
- /// </summary>
- /// <returns></returns>
- [HttpPost("GetList")]
- public ResponseResult GetList()
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetList();
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- /// <summary>
- /// 鏍规嵁涓婚敭鑾峰彇
- /// </summary>
- /// <returns></returns>
- [HttpPost("GetById")]
- public ResponseResult GetById(int id)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetById(id);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鏍规嵁涓婚敭鍒犻櫎
- /// </summary>
- /// <returns></returns>
- [HttpPost("DeleteByIds")]
- public ResponseResult DeleteByIds([FromBody] object[] ids)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.DeleteByIds(ids);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 娣诲姞
- /// </summary>
- /// <returns></returns>
- [HttpPost("Insert")]
- public ResponseResult Add([FromBody] Organize data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Insert(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
- /// <summary>
- /// 娣诲姞杩斿洖鑷
- /// </summary>
- /// <returns></returns>
- [HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] Organize data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.InsertReturnIdentity(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 淇敼
- /// </summary>
- /// <returns></returns>
- [HttpPost("Update")]
- public ResponseResult Update([FromBody] Organize data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Update(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
+ return ResponseResult.ResponseError(ex);
}
}
-}
+
+ [HttpPost("SaveList")]
+ public ResponseResult SaveList(List<ErpOrganize> units)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "SaveList";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(units);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.SaveList(units);
+ resultInfos.tbBillList = save;
+
+ entity.Result = 0;
+ if (save) entity.Result = 1;
+
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+
+ entity.DealWith = 0;
+
+ entity.ResultData = ex.Message;
+
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+ // private OrganizeManager m = new OrganizeManager();
+
+
+ /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetList")]
+ public ResponseResult GetList()
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetList();
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鑾峰彇
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetById")]
+ public ResponseResult GetById(int id)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetById(id);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁涓婚敭鍒犻櫎
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("DeleteByIds")]
+ public ResponseResult DeleteByIds([FromBody] object[] ids)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.DeleteByIds(ids);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Insert")]
+ public ResponseResult Add([FromBody] Organize data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Insert(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 娣诲姞杩斿洖鑷
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("InsertReturnIdentity")]
+ public ResponseResult InsertReturnIdentity([FromBody] Organize data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.InsertReturnIdentity(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("Update")]
+ public ResponseResult Update([FromBody] Organize data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Update(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/SalesDeliveryNoticeController.cs b/MESApplication/Controllers/BasicData/SalesDeliveryNoticeController.cs
index 4605bce..63e5edc 100644
--- a/MESApplication/Controllers/BasicData/SalesDeliveryNoticeController.cs
+++ b/MESApplication/Controllers/BasicData/SalesDeliveryNoticeController.cs
@@ -1,271 +1,263 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Dynamic;
+锘縰sing System.Dynamic;
+using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.util;
-using MES.Service.service.BasicData;
-using MES.Service.Dto.webApi;
+using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
-namespace MESApplication.Controllers
+namespace MESApplication.Controllers;
+
+[ApiController]
+[Route("api/[controller]")]
+public class SalesDeliveryNoticeController : ControllerBase
{
- [ApiController]
- [Route("api/[controller]")]
- public class SalesDeliveryNoticeController : ControllerBase
+ private readonly MessageCenterManager _manager = new();
+
+ private readonly SalesDeliveryNoticeManager m = new();
+
+ private readonly string METHOD = "POST";
+
+ private readonly string TableName = "SALES_DELIVERY_NOTICE";
+
+ private readonly string URL =
+ "http://localhost:10054/api/SalesDeliveryNotice/";
+
+
+ //
+ [HttpPost("Save")]
+ public ResponseResult Save(ErpSalesDelivery salesOrder)
{
-
-
-
- private readonly MessageCenterManager _manager = new();
-
- private SalesDeliveryNoticeManager m = new SalesDeliveryNoticeManager();
-
- private readonly string METHOD = "POST";
-
- private readonly string TableName = "SALES_DELIVERY_NOTICE";
-
- private readonly string URL = "http://localhost:10054/api/SalesDeliveryNotice/";
-
-
- //
- [HttpPost("Save")]
- public ResponseResult Save(ErpSalesDelivery salesOrder)
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Save";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(salesOrder);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+ try
{
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "Save";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(salesOrder);
- entity.Status = 1;
- entity.CreateBy = "PL017";
- try
+ dynamic resultInfos = new ExpandoObject();
+ var save = m.Save(salesOrder);
+
+ resultInfos.tbBillList = save;
+
+ entity.Result = 0;
+ if (save) entity.Result = 1;
+
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
{
- dynamic resultInfos = new ExpandoObject();
- var save = m.Save(salesOrder);
-
- 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);
- }
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
}
-
- [HttpPost("SaveList")]
- public ResponseResult SaveList(List<ErpSalesDelivery> units)
+ catch (Exception ex)
{
- 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;
- entity.Result = 0;
- if (save) entity.Result = 1;
+ entity.DealWith = 0;
- entity.DealWith = 1;
- _manager.save(entity);
+ entity.ResultData = ex.Message;
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- entity.Result = 0;
+ _manager.save(entity);
- 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] SalesDeliveryNotice 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] SalesDeliveryNotice 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] SalesDeliveryNotice 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);
- }
+ return ResponseResult.ResponseError(ex);
}
}
-}
+
+ [HttpPost("SaveList")]
+ public ResponseResult SaveList(List<ErpSalesDelivery> 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] SalesDeliveryNotice 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] SalesDeliveryNotice 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] SalesDeliveryNotice 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/SalesDeliveryNoticeDetailController.cs b/MESApplication/Controllers/BasicData/SalesDeliveryNoticeDetailController.cs
index 935a343..02bf080 100644
--- a/MESApplication/Controllers/BasicData/SalesDeliveryNoticeDetailController.cs
+++ b/MESApplication/Controllers/BasicData/SalesDeliveryNoticeDetailController.cs
@@ -1,169 +1,163 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Dynamic;
+锘縰sing System.Dynamic;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.util;
+using Microsoft.AspNetCore.Mvc;
-namespace MESApplication.Controllers
+namespace MESApplication.Controllers;
+
+[ApiController]
+[Route("api/[controller]")]
+public class SalesDeliveryNoticeDetailController : ControllerBase
{
- [ApiController]
- [Route("api/[controller]")]
- public class SalesDeliveryNoticeDetailController : ControllerBase
+ private readonly SalesDeliveryNoticeDetailManager m = new();
+
+
+ /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetList")]
+ public ResponseResult GetList()
{
-
- private SalesDeliveryNoticeDetailManager m = new SalesDeliveryNoticeDetailManager();
-
-
- /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
-
- /// <summary>
- /// 鑾峰彇鎵�鏈�
- /// </summary>
- /// <returns></returns>
- [HttpPost("GetList")]
- public ResponseResult GetList()
+ try
{
- try
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetList();
+ return new ResponseResult
{
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetList();
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
}
-
-
- /// <summary>
- /// 鏍规嵁涓婚敭鑾峰彇
- /// </summary>
- /// <returns></returns>
- [HttpPost("GetById")]
- public ResponseResult GetById(int id)
+ catch (Exception ex)
{
- 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] SalesDeliveryNoticeDetail 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] SalesDeliveryNoticeDetail 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] SalesDeliveryNoticeDetail 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);
- }
+ 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] SalesDeliveryNoticeDetail 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] SalesDeliveryNoticeDetail 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] SalesDeliveryNoticeDetail data)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.Update(data);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+}
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/SalesOrderController.cs b/MESApplication/Controllers/BasicData/SalesOrderController.cs
index a578b9c..ba760b9 100644
--- a/MESApplication/Controllers/BasicData/SalesOrderController.cs
+++ b/MESApplication/Controllers/BasicData/SalesOrderController.cs
@@ -1,11 +1,11 @@
锘縰sing System.Dynamic;
using MES.Service.Dto.webApi;
-using Newtonsoft.Json;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
namespace MESApplication.Controllers.BasicData;
diff --git a/MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs b/MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs
index bc5249d..99022cc 100644
--- a/MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs
+++ b/MESApplication/Controllers/BasicData/SalesReturnNoticeController.cs
@@ -13,7 +13,7 @@
[Route("api/[controller]")]
public class SalesReturnNoticeController : ControllerBase
{
- private readonly MessageCenterManager _manager = new();
+ private readonly MessageCenterManager _manager = new();
private readonly SalesReturnNoticeManager m = new();
@@ -21,7 +21,8 @@
private readonly string TableName = "SALES_RETURN_NOTICE";
- private readonly string URL = "http://localhost:10054/api/SalesReturnNotice/";
+ private readonly string URL =
+ "http://localhost:10054/api/SalesReturnNotice/";
//
@@ -111,10 +112,6 @@
return ResponseResult.ResponseError(ex);
}
}
-
-
-
-
/***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
diff --git a/MESApplication/Controllers/QC/PcbTestDataController.cs b/MESApplication/Controllers/QC/PcbTestDataController.cs
index 185694b..94bfc1e 100644
--- a/MESApplication/Controllers/QC/PcbTestDataController.cs
+++ b/MESApplication/Controllers/QC/PcbTestDataController.cs
@@ -1,4 +1,3 @@
-using System;
using System.Dynamic;
using MES.Service.Dto.service;
using MES.Service.Modes;
@@ -9,500 +8,506 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
-namespace MESApplication.Controllers.QC
+namespace MESApplication.Controllers.QC;
+
+/// <summary>
+/// PCB妫�娴嬫暟鎹帶鍒跺櫒
+/// </summary>
+[Route("api/[controller]")]
+[ApiController]
+public class PcbTestDataController : ControllerBase
{
+ private readonly MessageCenterManager _manager = new();
+ private readonly PcbTestDataService _service = new();
+
+ private readonly string METHOD = "POST";
+ private readonly string TableName = "MES_PCB_TEST_DATA";
+ private readonly string URL = "http://localhost:10054/api/PcbTestData/";
+
/// <summary>
- /// PCB妫�娴嬫暟鎹帶鍒跺櫒
+ /// 淇濆瓨鏁存澘妫�娴嬫暟鎹�
/// </summary>
- [Route("api/[controller]")]
- [ApiController]
- public class PcbTestDataController : ControllerBase
+ /// <param name="dto">鏁存澘妫�娴嬫暟鎹瓺TO</param>
+ /// <returns>淇濆瓨缁撴灉</returns>
+ [HttpPost("SaveWholeboardData")]
+ public ResponseResult SaveWholeboardData(
+ [FromBody] WholeboardGenerateDto dto)
{
- private readonly MessageCenterManager _manager = new();
- private readonly PcbTestDataService _service = new();
-
- private readonly string METHOD = "POST";
- private readonly string TableName = "MES_PCB_TEST_DATA";
- private readonly string URL = "http://localhost:10054/api/PcbTestData/";
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "SaveWholeboardData";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(dto);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
- /// <summary>
- /// 淇濆瓨鏁存澘妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="dto">鏁存澘妫�娴嬫暟鎹瓺TO</param>
- /// <returns>淇濆瓨缁撴灉</returns>
- [HttpPost("SaveWholeboardData")]
- public ResponseResult SaveWholeboardData([FromBody] WholeboardGenerateDto dto)
+ try
{
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "SaveWholeboardData";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(dto);
- entity.Status = 1;
- entity.CreateBy = "PL017";
-
- try
+ dynamic resultInfos = new ExpandoObject();
+ var result = _service.SaveWholeboardData(dto);
+ resultInfos.result = result;
+ resultInfos.message = result ? "鏁存澘妫�娴嬫暟鎹繚瀛樻垚鍔�" : "鏁存澘妫�娴嬫暟鎹繚瀛樺け璐�";
+
+ entity.Result = result ? (short)1 : (short)0;
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
{
- dynamic resultInfos = new ExpandoObject();
- var result = _service.SaveWholeboardData(dto);
- resultInfos.result = result;
- resultInfos.message = result ? "鏁存澘妫�娴嬫暟鎹繚瀛樻垚鍔�" : "鏁存澘妫�娴嬫暟鎹繚瀛樺け璐�";
-
- entity.Result = result ? (short)1 : (short)0;
- entity.DealWith = 1;
- _manager.save(entity);
-
+ status = result ? 0 : 1,
+ message = result ? "OK" : "FAIL",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+ entity.DealWith = 0;
+ entity.ResultData = ex.Message;
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 淇濆瓨鍗曟澘妫�娴嬫暟鎹�
+ /// </summary>
+ /// <param name="dto">鍗曟澘妫�娴嬫暟鎹瓺TO</param>
+ /// <returns>淇濆瓨缁撴灉</returns>
+ [HttpPost("SaveSingleBoardData")]
+ public ResponseResult SaveSingleBoardData(
+ [FromBody] SingleBoardGenerateDto dto)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "SaveSingleBoardData";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(dto);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var result = _service.SaveSingleBoardData(dto);
+ resultInfos.result = result;
+ resultInfos.message = result ? "鍗曟澘妫�娴嬫暟鎹繚瀛樻垚鍔�" : "鍗曟澘妫�娴嬫暟鎹繚瀛樺け璐�";
+
+ entity.Result = result ? (short)1 : (short)0;
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
+ {
+ status = result ? 0 : 1,
+ message = result ? "OK" : "FAIL",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+ entity.DealWith = 0;
+ entity.ResultData = ex.Message;
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨPCB妫�娴嬫暟鎹�
+ /// </summary>
+ /// <param name="request">鏌ヨ璇锋眰</param>
+ /// <returns>鍒嗛〉鏁版嵁</returns>
+ [HttpPost("GetPage")]
+ public ResponseResult GetPage([FromBody] JObject request)
+ {
+ try
+ {
+ var dataType = request["dataType"]?.ToString();
+ var deviceName = request["deviceName"]?.ToString();
+ var pcbSn = request["pcbSn"]?.ToString();
+ var startTime = request["startTime"]?.ToString();
+ var endTime = request["endTime"]?.ToString();
+ var pageIndex = request["pageIndex"]?.ToObject<int>() ?? 1;
+ var pageSize = request["pageSize"]?.ToObject<int>() ?? 20;
+
+ DateTime? startDateTime = null;
+ DateTime? endDateTime = null;
+
+ if (StringUtil.IsNotNullOrEmpty(startTime) &&
+ DateTime.TryParse(startTime, out var start))
+ startDateTime = start;
+
+ if (StringUtil.IsNotNullOrEmpty(endTime) &&
+ DateTime.TryParse(endTime, out var end))
+ endDateTime = end;
+
+ var (items, totalCount) = _service.GetPcbTestDataPage(
+ dataType, deviceName, pcbSn, startDateTime, endDateTime,
+ pageIndex, pageSize);
+
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.items = items;
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos,
+ TotalCount = totalCount
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁ID鑾峰彇PCB妫�娴嬫暟鎹�
+ /// </summary>
+ /// <param name="request">璇锋眰鍙傛暟</param>
+ /// <returns>PCB妫�娴嬫暟鎹�</returns>
+ [HttpPost("GetById")]
+ public ResponseResult GetById([FromBody] JObject request)
+ {
+ try
+ {
+ var id = request["id"]?.ToObject<decimal>();
+ if (!id.HasValue)
return new ResponseResult
{
- status = result ? 0 : 1,
- message = result ? "OK" : "FAIL",
- data = resultInfos
+ status = 1,
+ message = "ID涓嶈兘涓虹┖",
+ data = null
};
- }
- catch (Exception ex)
+
+ var testData = _service.GetPcbTestDataById(id.Value);
+ var componentData = _service.GetComponentDataByTestDataId(id.Value);
+
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.testData = testData;
+ resultInfos.componentData = componentData;
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鏍规嵁PCB鏉＄爜鑾峰彇妫�娴嬫暟鎹�
+ /// </summary>
+ /// <param name="request">璇锋眰鍙傛暟</param>
+ /// <returns>妫�娴嬫暟鎹垪琛�</returns>
+ [HttpPost("GetByPcbSn")]
+ public ResponseResult GetByPcbSn([FromBody] JObject request)
+ {
+ try
+ {
+ var pcbSn = request["pcbSn"]?.ToString();
+ if (StringUtil.IsNullOrEmpty(pcbSn))
+ return new ResponseResult
+ {
+ status = 1,
+ message = "PCB鏉＄爜涓嶈兘涓虹┖",
+ data = null
+ };
+
+ var testDataList = _service.GetPcbTestDataByPcbSn(pcbSn);
+
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.testDataList = testDataList;
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍣ㄤ欢妫�娴嬫暟鎹�
+ /// </summary>
+ /// <param name="request">璇锋眰鍙傛暟</param>
+ /// <returns>鍣ㄤ欢妫�娴嬫暟鎹�</returns>
+ [HttpPost("GetComponentData")]
+ public ResponseResult GetComponentData([FromBody] JObject request)
+ {
+ try
+ {
+ var testDataId = request["testDataId"]?.ToObject<decimal>();
+ if (!testDataId.HasValue)
+ return new ResponseResult
+ {
+ status = 1,
+ message = "娴嬭瘯鏁版嵁ID涓嶈兘涓虹┖",
+ data = null
+ };
+
+ var componentData =
+ _service.GetComponentDataByTestDataId(testDataId.Value);
+
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.componentData = componentData;
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鑾峰彇妫�娴嬬粺璁℃暟鎹�
+ /// </summary>
+ /// <param name="request">璇锋眰鍙傛暟</param>
+ /// <returns>缁熻鏁版嵁</returns>
+ [HttpPost("GetStatistics")]
+ public ResponseResult GetStatistics([FromBody] JObject request)
+ {
+ try
+ {
+ var dataType = request["dataType"]?.ToString();
+ var deviceName = request["deviceName"]?.ToString();
+ var startTime = request["startTime"]?.ToString();
+ var endTime = request["endTime"]?.ToString();
+
+ DateTime? startDateTime = null;
+ DateTime? endDateTime = null;
+
+ if (StringUtil.IsNotNullOrEmpty(startTime) &&
+ DateTime.TryParse(startTime, out var start))
+ startDateTime = start;
+
+ if (StringUtil.IsNotNullOrEmpty(endTime) &&
+ DateTime.TryParse(endTime, out var end))
+ endDateTime = end;
+
+ var statistics = _service.GetTestStatistics(dataType, deviceName,
+ startDateTime, endDateTime);
+
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.statistics = statistics;
+
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鍒犻櫎PCB妫�娴嬫暟鎹�
+ /// </summary>
+ /// <param name="request">璇锋眰鍙傛暟</param>
+ /// <returns>鍒犻櫎缁撴灉</returns>
+ [HttpPost("Delete")]
+ public ResponseResult Delete([FromBody] JObject request)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "Delete";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(request);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+
+ try
+ {
+ var id = request["id"]?.ToObject<decimal>();
+ if (!id.HasValue)
{
entity.Result = 0;
entity.DealWith = 0;
- entity.ResultData = ex.Message;
+ entity.ResultData = "ID涓嶈兘涓虹┖";
_manager.save(entity);
-
- return ResponseResult.ResponseError(ex);
- }
- }
- /// <summary>
- /// 淇濆瓨鍗曟澘妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="dto">鍗曟澘妫�娴嬫暟鎹瓺TO</param>
- /// <returns>淇濆瓨缁撴灉</returns>
- [HttpPost("SaveSingleBoardData")]
- public ResponseResult SaveSingleBoardData([FromBody] SingleBoardGenerateDto dto)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "SaveSingleBoardData";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(dto);
- entity.Status = 1;
- entity.CreateBy = "PL017";
-
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var result = _service.SaveSingleBoardData(dto);
- resultInfos.result = result;
- resultInfos.message = result ? "鍗曟澘妫�娴嬫暟鎹繚瀛樻垚鍔�" : "鍗曟澘妫�娴嬫暟鎹繚瀛樺け璐�";
-
- entity.Result = result ? (short)1 : (short)0;
- entity.DealWith = 1;
- _manager.save(entity);
-
return new ResponseResult
{
- status = result ? 0 : 1,
- message = result ? "OK" : "FAIL",
- data = resultInfos
+ status = 1,
+ message = "ID涓嶈兘涓虹┖",
+ data = null
};
}
- catch (Exception ex)
+
+ var result = _service.DeletePcbTestData(id.Value);
+
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.result = result;
+ resultInfos.message = result ? "鍒犻櫎鎴愬姛" : "鍒犻櫎澶辫触";
+
+ entity.Result = result ? (short)1 : (short)0;
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
+ {
+ status = result ? 0 : 1,
+ message = result ? "OK" : "FAIL",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+ entity.DealWith = 0;
+ entity.ResultData = ex.Message;
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 缁熶竴淇濆瓨鎺ュ彛锛堣嚜鍔ㄨ瘑鍒暣鏉挎垨鍗曟澘鏁版嵁锛�
+ /// </summary>
+ /// <param name="request">璇锋眰鍙傛暟</param>
+ /// <returns>淇濆瓨缁撴灉</returns>
+ [HttpPost("SaveTestData")]
+ public ResponseResult SaveTestData([FromBody] JObject request)
+ {
+ var entity = new MessageCenter();
+ entity.TableName = TableName;
+ entity.Url = URL + "SaveTestData";
+ entity.Method = METHOD;
+ entity.Data = JsonConvert.SerializeObject(request);
+ entity.Status = 1;
+ entity.CreateBy = "PL017";
+
+ try
+ {
+ var dataType = request["dataType"]?.ToString();
+
+ if (StringUtil.IsNullOrEmpty(dataType))
{
entity.Result = 0;
entity.DealWith = 0;
- entity.ResultData = ex.Message;
- _manager.save(entity);
-
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鍒嗛〉鏌ヨPCB妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="request">鏌ヨ璇锋眰</param>
- /// <returns>鍒嗛〉鏁版嵁</returns>
- [HttpPost("GetPage")]
- public ResponseResult GetPage([FromBody] JObject request)
- {
- try
- {
- var dataType = request["dataType"]?.ToString();
- var deviceName = request["deviceName"]?.ToString();
- var pcbSn = request["pcbSn"]?.ToString();
- var startTime = request["startTime"]?.ToString();
- var endTime = request["endTime"]?.ToString();
- var pageIndex = request["pageIndex"]?.ToObject<int>() ?? 1;
- var pageSize = request["pageSize"]?.ToObject<int>() ?? 20;
-
- DateTime? startDateTime = null;
- DateTime? endDateTime = null;
-
- if (StringUtil.IsNotNullOrEmpty(startTime) && DateTime.TryParse(startTime, out var start))
- startDateTime = start;
-
- if (StringUtil.IsNotNullOrEmpty(endTime) && DateTime.TryParse(endTime, out var end))
- endDateTime = end;
-
- var (items, totalCount) = _service.GetPcbTestDataPage(
- dataType, deviceName, pcbSn, startDateTime, endDateTime, pageIndex, pageSize);
-
- dynamic resultInfos = new ExpandoObject();
- resultInfos.items = items;
-
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos,
- TotalCount = totalCount
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鏍规嵁ID鑾峰彇PCB妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="request">璇锋眰鍙傛暟</param>
- /// <returns>PCB妫�娴嬫暟鎹�</returns>
- [HttpPost("GetById")]
- public ResponseResult GetById([FromBody] JObject request)
- {
- try
- {
- var id = request["id"]?.ToObject<decimal>();
- if (!id.HasValue)
- {
- return new ResponseResult
- {
- status = 1,
- message = "ID涓嶈兘涓虹┖",
- data = null
- };
- }
-
- var testData = _service.GetPcbTestDataById(id.Value);
- var componentData = _service.GetComponentDataByTestDataId(id.Value);
-
- dynamic resultInfos = new ExpandoObject();
- resultInfos.testData = testData;
- resultInfos.componentData = componentData;
-
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鏍规嵁PCB鏉＄爜鑾峰彇妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="request">璇锋眰鍙傛暟</param>
- /// <returns>妫�娴嬫暟鎹垪琛�</returns>
- [HttpPost("GetByPcbSn")]
- public ResponseResult GetByPcbSn([FromBody] JObject request)
- {
- try
- {
- var pcbSn = request["pcbSn"]?.ToString();
- if (StringUtil.IsNullOrEmpty(pcbSn))
- {
- return new ResponseResult
- {
- status = 1,
- message = "PCB鏉＄爜涓嶈兘涓虹┖",
- data = null
- };
- }
-
- var testDataList = _service.GetPcbTestDataByPcbSn(pcbSn);
-
- dynamic resultInfos = new ExpandoObject();
- resultInfos.testDataList = testDataList;
-
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鑾峰彇鍣ㄤ欢妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="request">璇锋眰鍙傛暟</param>
- /// <returns>鍣ㄤ欢妫�娴嬫暟鎹�</returns>
- [HttpPost("GetComponentData")]
- public ResponseResult GetComponentData([FromBody] JObject request)
- {
- try
- {
- var testDataId = request["testDataId"]?.ToObject<decimal>();
- if (!testDataId.HasValue)
- {
- return new ResponseResult
- {
- status = 1,
- message = "娴嬭瘯鏁版嵁ID涓嶈兘涓虹┖",
- data = null
- };
- }
-
- var componentData = _service.GetComponentDataByTestDataId(testDataId.Value);
-
- dynamic resultInfos = new ExpandoObject();
- resultInfos.componentData = componentData;
-
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鑾峰彇妫�娴嬬粺璁℃暟鎹�
- /// </summary>
- /// <param name="request">璇锋眰鍙傛暟</param>
- /// <returns>缁熻鏁版嵁</returns>
- [HttpPost("GetStatistics")]
- public ResponseResult GetStatistics([FromBody] JObject request)
- {
- try
- {
- var dataType = request["dataType"]?.ToString();
- var deviceName = request["deviceName"]?.ToString();
- var startTime = request["startTime"]?.ToString();
- var endTime = request["endTime"]?.ToString();
-
- DateTime? startDateTime = null;
- DateTime? endDateTime = null;
-
- if (StringUtil.IsNotNullOrEmpty(startTime) && DateTime.TryParse(startTime, out var start))
- startDateTime = start;
-
- if (StringUtil.IsNotNullOrEmpty(endTime) && DateTime.TryParse(endTime, out var end))
- endDateTime = end;
-
- var statistics = _service.GetTestStatistics(dataType, deviceName, startDateTime, endDateTime);
-
- dynamic resultInfos = new ExpandoObject();
- resultInfos.statistics = statistics;
-
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鍒犻櫎PCB妫�娴嬫暟鎹�
- /// </summary>
- /// <param name="request">璇锋眰鍙傛暟</param>
- /// <returns>鍒犻櫎缁撴灉</returns>
- [HttpPost("Delete")]
- public ResponseResult Delete([FromBody] JObject request)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "Delete";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(request);
- entity.Status = 1;
- entity.CreateBy = "PL017";
-
- try
- {
- var id = request["id"]?.ToObject<decimal>();
- if (!id.HasValue)
- {
- entity.Result = 0;
- entity.DealWith = 0;
- entity.ResultData = "ID涓嶈兘涓虹┖";
- _manager.save(entity);
-
- return new ResponseResult
- {
- status = 1,
- message = "ID涓嶈兘涓虹┖",
- data = null
- };
- }
-
- var result = _service.DeletePcbTestData(id.Value);
-
- dynamic resultInfos = new ExpandoObject();
- resultInfos.result = result;
- resultInfos.message = result ? "鍒犻櫎鎴愬姛" : "鍒犻櫎澶辫触";
-
- entity.Result = result ? (short)1 : (short)0;
- entity.DealWith = 1;
+ entity.ResultData = "鏁版嵁绫诲瀷涓嶈兘涓虹┖锛岃鎸囧畾WHOLE鎴朣INGLE";
_manager.save(entity);
return new ResponseResult
{
- status = result ? 0 : 1,
- message = result ? "OK" : "FAIL",
- data = resultInfos
+ status = 1,
+ message = "鏁版嵁绫诲瀷涓嶈兘涓虹┖锛岃鎸囧畾WHOLE鎴朣INGLE",
+ data = null
};
}
- catch (Exception ex)
- {
- entity.Result = 0;
- entity.DealWith = 0;
- entity.ResultData = ex.Message;
- _manager.save(entity);
-
- return ResponseResult.ResponseError(ex);
- }
- }
- /// <summary>
- /// 缁熶竴淇濆瓨鎺ュ彛锛堣嚜鍔ㄨ瘑鍒暣鏉挎垨鍗曟澘鏁版嵁锛�
- /// </summary>
- /// <param name="request">璇锋眰鍙傛暟</param>
- /// <returns>淇濆瓨缁撴灉</returns>
- [HttpPost("SaveTestData")]
- public ResponseResult SaveTestData([FromBody] JObject request)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "SaveTestData";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(request);
- entity.Status = 1;
- entity.CreateBy = "PL017";
-
- try
+ dynamic resultInfos = new ExpandoObject();
+ var result = false;
+ var message = "";
+
+ switch (dataType.ToUpper())
{
- var dataType = request["dataType"]?.ToString();
-
- if (StringUtil.IsNullOrEmpty(dataType))
- {
- entity.Result = 0;
- entity.DealWith = 0;
- entity.ResultData = "鏁版嵁绫诲瀷涓嶈兘涓虹┖锛岃鎸囧畾WHOLE鎴朣INGLE";
- _manager.save(entity);
-
- return new ResponseResult
+ case "WHOLE":
+ var wholeboardDto = request["data"]
+ ?.ToObject<WholeboardGenerateDto>();
+ if (wholeboardDto == null)
{
- status = 1,
- message = "鏁版嵁绫诲瀷涓嶈兘涓虹┖锛岃鎸囧畾WHOLE鎴朣INGLE",
- data = null
- };
- }
-
- dynamic resultInfos = new ExpandoObject();
- bool result = false;
- string message = "";
-
- switch (dataType.ToUpper())
- {
- case "WHOLE":
- var wholeboardDto = request["data"]?.ToObject<WholeboardGenerateDto>();
- if (wholeboardDto == null)
- {
- entity.Result = 0;
- entity.DealWith = 0;
- entity.ResultData = "鏁存澘鏁版嵁涓嶈兘涓虹┖";
- _manager.save(entity);
-
- return new ResponseResult
- {
- status = 1,
- message = "鏁存澘鏁版嵁涓嶈兘涓虹┖",
- data = null
- };
- }
- result = _service.SaveWholeboardData(wholeboardDto);
- message = result ? "鏁存澘妫�娴嬫暟鎹繚瀛樻垚鍔�" : "鏁存澘妫�娴嬫暟鎹繚瀛樺け璐�";
- break;
-
- case "SINGLE":
- var singleBoardDto = request["data"]?.ToObject<SingleBoardGenerateDto>();
- if (singleBoardDto == null)
- {
- entity.Result = 0;
- entity.DealWith = 0;
- entity.ResultData = "鍗曟澘鏁版嵁涓嶈兘涓虹┖";
- _manager.save(entity);
-
- return new ResponseResult
- {
- status = 1,
- message = "鍗曟澘鏁版嵁涓嶈兘涓虹┖",
- data = null
- };
- }
- result = _service.SaveSingleBoardData(singleBoardDto);
- message = result ? "鍗曟澘妫�娴嬫暟鎹繚瀛樻垚鍔�" : "鍗曟澘妫�娴嬫暟鎹繚瀛樺け璐�";
- break;
-
- default:
entity.Result = 0;
entity.DealWith = 0;
- entity.ResultData = "涓嶆敮鎸佺殑鏁版嵁绫诲瀷锛岃鎸囧畾WHOLE鎴朣INGLE";
+ entity.ResultData = "鏁存澘鏁版嵁涓嶈兘涓虹┖";
_manager.save(entity);
-
+
return new ResponseResult
{
status = 1,
- message = "涓嶆敮鎸佺殑鏁版嵁绫诲瀷锛岃鎸囧畾WHOLE鎴朣INGLE",
+ message = "鏁存澘鏁版嵁涓嶈兘涓虹┖",
data = null
};
- }
+ }
- resultInfos.result = result;
- resultInfos.message = message;
+ result = _service.SaveWholeboardData(wholeboardDto);
+ message = result ? "鏁存澘妫�娴嬫暟鎹繚瀛樻垚鍔�" : "鏁存澘妫�娴嬫暟鎹繚瀛樺け璐�";
+ break;
- entity.Result = result ? (short)1 : (short)0;
- entity.DealWith = 1;
- _manager.save(entity);
+ case "SINGLE":
+ var singleBoardDto = request["data"]
+ ?.ToObject<SingleBoardGenerateDto>();
+ if (singleBoardDto == null)
+ {
+ entity.Result = 0;
+ entity.DealWith = 0;
+ entity.ResultData = "鍗曟澘鏁版嵁涓嶈兘涓虹┖";
+ _manager.save(entity);
- return new ResponseResult
- {
- status = result ? 0 : 1,
- message = result ? "OK" : "FAIL",
- data = resultInfos
- };
+ return new ResponseResult
+ {
+ status = 1,
+ message = "鍗曟澘鏁版嵁涓嶈兘涓虹┖",
+ data = null
+ };
+ }
+
+ result = _service.SaveSingleBoardData(singleBoardDto);
+ message = result ? "鍗曟澘妫�娴嬫暟鎹繚瀛樻垚鍔�" : "鍗曟澘妫�娴嬫暟鎹繚瀛樺け璐�";
+ break;
+
+ default:
+ entity.Result = 0;
+ entity.DealWith = 0;
+ entity.ResultData = "涓嶆敮鎸佺殑鏁版嵁绫诲瀷锛岃鎸囧畾WHOLE鎴朣INGLE";
+ _manager.save(entity);
+
+ return new ResponseResult
+ {
+ status = 1,
+ message = "涓嶆敮鎸佺殑鏁版嵁绫诲瀷锛岃鎸囧畾WHOLE鎴朣INGLE",
+ data = null
+ };
}
- catch (Exception ex)
+
+ resultInfos.result = result;
+ resultInfos.message = message;
+
+ entity.Result = result ? (short)1 : (short)0;
+ entity.DealWith = 1;
+ _manager.save(entity);
+
+ return new ResponseResult
{
- entity.Result = 0;
- entity.DealWith = 0;
- entity.ResultData = ex.Message;
- _manager.save(entity);
-
- return ResponseResult.ResponseError(ex);
- }
+ status = result ? 0 : 1,
+ message = result ? "OK" : "FAIL",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ entity.Result = 0;
+ entity.DealWith = 0;
+ entity.ResultData = ex.Message;
+ _manager.save(entity);
+
+ return ResponseResult.ResponseError(ex);
}
}
}
\ No newline at end of file
diff --git a/MESApplication/Controllers/QC/RKJController.cs b/MESApplication/Controllers/QC/RKJController.cs
index 46d0919..ec7ea56 100644
--- a/MESApplication/Controllers/QC/RKJController.cs
+++ b/MESApplication/Controllers/QC/RKJController.cs
@@ -394,7 +394,7 @@
{
try
{
- dynamic resultInfos = new ExpandoObject();
+ dynamic resultInfos = new ExpandoObject();
return new ResponseResult
{
diff --git a/MESApplication/Controllers/QC/SJController.cs b/MESApplication/Controllers/QC/SJController.cs
index ec59913..5c29a23 100644
--- a/MESApplication/Controllers/QC/SJController.cs
+++ b/MESApplication/Controllers/QC/SJController.cs
@@ -70,7 +70,6 @@
var itemNo = data["itemId"].ToString();
try
{
-
dynamic resultInfos = new ExpandoObject();
var tbBillList = new SJService();
var detail021 = tbBillList.SetQSItems(itemNo);
diff --git a/MESApplication/Controllers/QC/XJController.cs b/MESApplication/Controllers/QC/XJController.cs
index bc19dfd..7f23656 100644
--- a/MESApplication/Controllers/QC/XJController.cs
+++ b/MESApplication/Controllers/QC/XJController.cs
@@ -4,7 +4,6 @@
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
-using Microsoft.Data.SqlClient.Server;
using Newtonsoft.Json.Linq;
namespace MESApplication.Controllers.QC;
@@ -168,7 +167,6 @@
var itemNo = "XJ001";
try
{
-
dynamic resultInfos = new ExpandoObject();
var tbBillList =
new XJService().setJYItem(itemNo);
@@ -422,6 +420,7 @@
return ResponseResult.ResponseError(ex);
}
}
+
//saveRemarksPid
[HttpPost("saveRemarksPid")]
public ResponseResult saveRemarksPid([FromBody] XJDto rkjDto)
diff --git a/MESApplication/Controllers/WomcaaWWController.cs b/MESApplication/Controllers/WomcaaWWController.cs
index 68c7fdb..6b1893b 100644
--- a/MESApplication/Controllers/WomcaaWWController.cs
+++ b/MESApplication/Controllers/WomcaaWWController.cs
@@ -1,5 +1,4 @@
-锘�
-using System.Dynamic;
+锘縰sing System.Dynamic;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
--
Gitblit v1.9.3