From ded234fb90ed5f25a71cff7179df7232d5758800 Mon Sep 17 00:00:00 2001
From: zjh <2207896513@qq.com>
Date: 星期一, 24 三月 2025 09:14:40 +0800
Subject: [PATCH] 1代码整理 2移动端来料检添加项目字段，并能根据此字段搜索 3来料检明细添加‘获取检验项目’按钮，实现在移动端重新获取检验项目
---
StandardPda/MES.Service/service/QC/SJService.cs | 2
StandardPda/MES.Service/service/BasicData/ProductionOrderManager.cs | 4
StandardPda/MESApplication/Controllers/BasicData/MesStaffController.cs | 4
StandardPda/MES.Service/Modes/Purdhb.cs | 352 ++++----
StandardPda/MES.Service/Modes/MesInvTransaction.cs | 96 +-
StandardPda/MES.Service/Modes/MesDepTaskInfo.cs | 448 +++++-----
StandardPda/MESApplication/Controllers/BasicData/EmployeeInfoController.cs | 4
StandardPda/MESApplication/Controllers/BasicData/MesSupplierController.cs | 4
StandardPda/MESApplication/Controllers/BasicData/MesDepotsController.cs | 4
StandardPda/MES.Service/Modes/QsItemIpiItem.cs | 2
StandardPda/MESApplication/Controllers/BasicData/MesRohInDataController.cs | 4
StandardPda/MES.Service/Modes/Purdka.cs | 160 +-
StandardPda/MES.Service/service/QC/RKJService.cs | 8
StandardPda/MES.Service/Modes/VMesQaItemsDetect01.cs | 8
StandardPda/MESApplication/Controllers/QC/BaseController.cs | 4
StandardPda/MES.Service/Modes/SysUser.cs | 2
StandardPda/MES.Service/Modes/MesQsSuspend.cs | 2
StandardPda/MES.Service/Modes/QsItemIpiReq.cs | 2
StandardPda/MES.Service/Modes/MesQualityStandard.cs | 2
StandardPda/MESApplication/Filter/ActionFilter.cs | 6
StandardPda/MES.Service/Modes/MesQaItemsDetectDetail5.cs | 10
StandardPda/MES.Service/service/BasicData/ShipmentDetailManager.cs | 3
StandardPda/MESApplication/Controllers/BasicData/MesRohInController.cs | 4
StandardPda/MESApplication/Controllers/BasicData/MesPositionController.cs | 4
StandardPda/MES.Service/service/LoginService.cs | 4
StandardPda/MESApplication/Controllers/QC/SuspendController.cs | 4
StandardPda/MES.Service/service/BasicData/SalesReturnNoticeDetailManager.cs | 3
StandardPda/MESApplication/Controllers/BasicData/MesCustomerController.cs | 4
StandardPda/MES.Service/Modes/LtsLlj.cs | 5
StandardPda/MES.Service/DB/Repository.cs | 10
StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs | 4
StandardPda/MESApplication/Startup.cs | 6
StandardPda/MES.Service/Modes/QsItemIpiItemDetail.cs | 2
StandardPda/MESApplication/Controllers/QC/LljController.cs | 20
StandardPda/MES.Service/Modes/MesBarcodeType.cs | 320 +++---
StandardPda/MES.Service/Modes/MesQa.cs | 2
StandardPda/MESApplication/Controllers/BasicData/MesItemTypeController.cs | 4
StandardPda/MES.Service/service/MessageCenterManager.cs | 5
StandardPda/MES.Service/service/BasicData/SalesOrderDetailManager.cs | 3
StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs | 4
StandardPda/MES.Service/service/BasicData/MesRohInDataManager.cs | 3
StandardPda/MES.Service/Modes/MesInvItemMoves.cs | 224 ++--
StandardPda/MES.Service/service/BasicData/OrganizeManager.cs | 3
StandardPda/MES.Service/service/QC/SuspendService.cs | 6
StandardPda/MESApplication/Controllers/BasicData/ProductionOrderController.cs | 4
StandardPda/MESApplication/Controllers/QC/RKJController.cs | 4
StandardPda/MESApplication/Controllers/BasicData/MesUnitController.cs | 4
StandardPda/MES.Service/Modes/QsItemOqcReq.cs | 2
StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteController.cs | 4
StandardPda/MES.Service/Modes/MesQaIqc.cs | 10
StandardPda/MES.Service/DB/RepositoryNoEntity.cs | 10
StandardPda/MES.Service/Modes/QsQaItemXj01.cs | 2
StandardPda/MES.Service/Modes/QsItemOqcItem.cs | 2
StandardPda/MESApplication/Controllers/BasicData/MesItemsController.cs | 4
StandardPda/MES.Service/Modes/MesInvItemInCItems.cs | 184 ++--
StandardPda/MES.Service/Modes/QsItemOqcItemDetail.cs | 2
StandardPda/MES.Service/service/QC/LljService.cs | 232 +++--
StandardPda/MESApplication/Controllers/QC/SJController.cs | 4
StandardPda/MES.Service/Modes/MesInvItemArn.cs | 304 +++---
StandardPda/MESApplication/Controllers/QC/XJController.cs | 4
StandardPda/MES.Service/Modes/Womcab.cs | 2
StandardPda/MESApplication/Controllers/BasicData/OrganizeController.cs | 4
StandardPda/MES.Service/service/BasicData/ProductionOrderSubManager.cs | 3
StandardPda/MES.Service/Modes/QsQaItemXj.cs | 2
StandardPda/MES.Service/service/BasicData/SalesOrderManager.cs | 3
StandardPda/MESApplication/Controllers/Base/LoginController.cs | 4
StandardPda/MES.Service/Modes/MesQsImage.cs | 2
StandardPda/MES.Service/Modes/QsQaItemXj02.cs | 2
StandardPda/MESApplication/Controllers/BasicData/MESProductionNoticeController.cs | 4
StandardPda/MESApplication/Controllers/BasicData/SysDepartmentController.cs | 4
StandardPda/MES.Service/Modes/MesQaItemsDetect02.cs | 2
StandardPda/MES.Service/service/QC/XJService.cs | 3
72 files changed, 1,332 insertions(+), 1,254 deletions(-)
diff --git a/StandardPda/MES.Service/DB/Repository.cs b/StandardPda/MES.Service/DB/Repository.cs
index 9906f8f..103f898 100644
--- a/StandardPda/MES.Service/DB/Repository.cs
+++ b/StandardPda/MES.Service/DB/Repository.cs
@@ -6,11 +6,11 @@
public class Repository<T> : SimpleClient<T> where T : class, new()
{
protected static SqlSugarScope Db = new(new ConnectionConfig
- {
- DbType = DbType.Oracle,
- ConnectionString = AppsettingsUtility.Settings.DataBaseConn,
- IsAutoCloseConnection = true
- },
+ {
+ DbType = DbType.Oracle,
+ ConnectionString = AppsettingsUtility.Settings.DataBaseConn,
+ IsAutoCloseConnection = true
+ },
db =>
{
db.Aop.OnLogExecuting = (sql, pars) =>
diff --git a/StandardPda/MES.Service/DB/RepositoryNoEntity.cs b/StandardPda/MES.Service/DB/RepositoryNoEntity.cs
index c2d5dc1..037812b 100644
--- a/StandardPda/MES.Service/DB/RepositoryNoEntity.cs
+++ b/StandardPda/MES.Service/DB/RepositoryNoEntity.cs
@@ -6,11 +6,11 @@
public class RepositoryNoEntity
{
protected static SqlSugarScope Db = new(new ConnectionConfig
- {
- DbType = DbType.Oracle,
- ConnectionString = AppsettingsUtility.Settings.DataBaseConn,
- IsAutoCloseConnection = true
- },
+ {
+ DbType = DbType.Oracle,
+ ConnectionString = AppsettingsUtility.Settings.DataBaseConn,
+ IsAutoCloseConnection = true
+ },
db =>
{
db.Aop.OnLogExecuting = (sql, pars) =>
diff --git a/StandardPda/MES.Service/Modes/LtsLlj.cs b/StandardPda/MES.Service/Modes/LtsLlj.cs
index 0e7f4eb..11dafc7 100644
--- a/StandardPda/MES.Service/Modes/LtsLlj.cs
+++ b/StandardPda/MES.Service/Modes/LtsLlj.cs
@@ -189,4 +189,9 @@
/// </summary>
[SugarColumn(IsIgnore = true)]
public string? NewFngDesc { get; set; }
+ /// <summary>
+ /// 椤圭洰
+ /// </summary>
+ [SugarColumn(IsIgnore = true)]
+ public string? ProjectCodes { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/MesBarcodeType.cs b/StandardPda/MES.Service/Modes/MesBarcodeType.cs
index 2a8c96a..8b60413 100644
--- a/StandardPda/MES.Service/Modes/MesBarcodeType.cs
+++ b/StandardPda/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/StandardPda/MES.Service/Modes/MesDepTaskInfo.cs b/StandardPda/MES.Service/Modes/MesDepTaskInfo.cs
index 49b445b..a702456 100644
--- a/StandardPda/MES.Service/Modes/MesDepTaskInfo.cs
+++ b/StandardPda/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/StandardPda/MES.Service/Modes/MesInvItemArn.cs b/StandardPda/MES.Service/Modes/MesInvItemArn.cs
index bf0d207..4d02989 100644
--- a/StandardPda/MES.Service/Modes/MesInvItemArn.cs
+++ b/StandardPda/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/StandardPda/MES.Service/Modes/MesInvItemInCItems.cs b/StandardPda/MES.Service/Modes/MesInvItemInCItems.cs
index 9c3eb27..2902881 100644
--- a/StandardPda/MES.Service/Modes/MesInvItemInCItems.cs
+++ b/StandardPda/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/StandardPda/MES.Service/Modes/MesInvItemMoves.cs b/StandardPda/MES.Service/Modes/MesInvItemMoves.cs
index 07b4ba6..c81d7b0 100644
--- a/StandardPda/MES.Service/Modes/MesInvItemMoves.cs
+++ b/StandardPda/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/StandardPda/MES.Service/Modes/MesInvTransaction.cs b/StandardPda/MES.Service/Modes/MesInvTransaction.cs
index 635c014..dff3a80 100644
--- a/StandardPda/MES.Service/Modes/MesInvTransaction.cs
+++ b/StandardPda/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/StandardPda/MES.Service/Modes/MesQa.cs b/StandardPda/MES.Service/Modes/MesQa.cs
index 198761e..6215ac7 100644
--- a/StandardPda/MES.Service/Modes/MesQa.cs
+++ b/StandardPda/MES.Service/Modes/MesQa.cs
@@ -1,6 +1,6 @@
+using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
namespace MES.Service.Modes;
diff --git a/StandardPda/MES.Service/Modes/MesQaIqc.cs b/StandardPda/MES.Service/Modes/MesQaIqc.cs
index f79b200..846cf8d 100644
--- a/StandardPda/MES.Service/Modes/MesQaIqc.cs
+++ b/StandardPda/MES.Service/Modes/MesQaIqc.cs
@@ -68,15 +68,21 @@
[SugarColumn(ColumnName = "FSPEC_REQU")]
public string FspecRequ { get; set; }
+
+ /// <summary>
+ /// 椤规缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_ID")] // 缂哄け瀛楁闇�瑕佹坊鍔�
+ public string? ItemId { get; set; }
/// <summary>
/// </summary>
[SugarColumn(ColumnName = "ISENABLED")]
- public short? ISENABLED { get; set; }
+ public byte? ISENABLED { get; set; }
/// <summary>
/// </summary>
[SugarColumn(ColumnName = "EE")]
- public short? EE { get; set; }
+ public byte? EE { get; set; }
/// <summary>
/// </summary>
diff --git a/StandardPda/MES.Service/Modes/MesQaItemsDetect02.cs b/StandardPda/MES.Service/Modes/MesQaItemsDetect02.cs
index d5e1b35..361550e 100644
--- a/StandardPda/MES.Service/Modes/MesQaItemsDetect02.cs
+++ b/StandardPda/MES.Service/Modes/MesQaItemsDetect02.cs
@@ -1,6 +1,6 @@
+using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
namespace MES.Service.Modes;
diff --git a/StandardPda/MES.Service/Modes/MesQaItemsDetectDetail5.cs b/StandardPda/MES.Service/Modes/MesQaItemsDetectDetail5.cs
index d49b200..4c57ba3 100644
--- a/StandardPda/MES.Service/Modes/MesQaItemsDetectDetail5.cs
+++ b/StandardPda/MES.Service/Modes/MesQaItemsDetectDetail5.cs
@@ -151,14 +151,14 @@
/// <summary>
/// 鐗瑰畾淇敼
/// </summary>
- [SugarColumn(ColumnName = "GIVEN_MODIFY")]
- public short? GivenModify { get; set; }
+ [SugarColumn(ColumnName = "GIVEN_MODIFY", DefaultValue = "0")]
+ public byte? GivenModify { get; set; }
/// <summary>
- /// 妫�楠屽伐鍏�
+ /// 妫�楠屽伐鍏�
/// </summary>
- [SugarColumn(ColumnName = "FCHECK_TOOL")]
- public string FcheckTool { get; set; }
+ [SugarColumn(ColumnName = "FCHECK_TOOL", Length = 100)] // 鏄庣‘闀垮害闄愬埗
+ public string? FcheckTool { get; set; }
/// <summary>
/// 鏇存柊浜�
diff --git a/StandardPda/MES.Service/Modes/MesQsImage.cs b/StandardPda/MES.Service/Modes/MesQsImage.cs
index 0ea58fd..382408d 100644
--- a/StandardPda/MES.Service/Modes/MesQsImage.cs
+++ b/StandardPda/MES.Service/Modes/MesQsImage.cs
@@ -1,6 +1,6 @@
+using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
namespace MES.Service.Modes;
diff --git a/StandardPda/MES.Service/Modes/MesQsSuspend.cs b/StandardPda/MES.Service/Modes/MesQsSuspend.cs
index 23ff075..4ccb775 100644
--- a/StandardPda/MES.Service/Modes/MesQsSuspend.cs
+++ b/StandardPda/MES.Service/Modes/MesQsSuspend.cs
@@ -1,6 +1,6 @@
+using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
namespace MES.Service.Modes;
diff --git a/StandardPda/MES.Service/Modes/MesQualityStandard.cs b/StandardPda/MES.Service/Modes/MesQualityStandard.cs
index bf414fa..b4fdcfb 100644
--- a/StandardPda/MES.Service/Modes/MesQualityStandard.cs
+++ b/StandardPda/MES.Service/Modes/MesQualityStandard.cs
@@ -1,6 +1,6 @@
+using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
namespace MES.Service.Modes;
diff --git a/StandardPda/MES.Service/Modes/Purdhb.cs b/StandardPda/MES.Service/Modes/Purdhb.cs
index b8de0cc..5af5bf3 100644
--- a/StandardPda/MES.Service/Modes/Purdhb.cs
+++ b/StandardPda/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/StandardPda/MES.Service/Modes/Purdka.cs b/StandardPda/MES.Service/Modes/Purdka.cs
index 4330c13..9ffb101 100644
--- a/StandardPda/MES.Service/Modes/Purdka.cs
+++ b/StandardPda/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/StandardPda/MES.Service/Modes/QsItemIpiItem.cs b/StandardPda/MES.Service/Modes/QsItemIpiItem.cs
index 59642a8..b154739 100644
--- a/StandardPda/MES.Service/Modes/QsItemIpiItem.cs
+++ b/StandardPda/MES.Service/Modes/QsItemIpiItem.cs
@@ -1,6 +1,6 @@
+using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
namespace MES.Service.Modes;
diff --git a/StandardPda/MES.Service/Modes/QsItemIpiItemDetail.cs b/StandardPda/MES.Service/Modes/QsItemIpiItemDetail.cs
index 0d1c504..f929172 100644
--- a/StandardPda/MES.Service/Modes/QsItemIpiItemDetail.cs
+++ b/StandardPda/MES.Service/Modes/QsItemIpiItemDetail.cs
@@ -1,6 +1,6 @@
+using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
namespace MES.Service.Modes;
diff --git a/StandardPda/MES.Service/Modes/QsItemIpiReq.cs b/StandardPda/MES.Service/Modes/QsItemIpiReq.cs
index 0daac60..89117b6 100644
--- a/StandardPda/MES.Service/Modes/QsItemIpiReq.cs
+++ b/StandardPda/MES.Service/Modes/QsItemIpiReq.cs
@@ -1,6 +1,6 @@
+using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
namespace MES.Service.Modes;
diff --git a/StandardPda/MES.Service/Modes/QsItemOqcItem.cs b/StandardPda/MES.Service/Modes/QsItemOqcItem.cs
index 663083a..79a6873 100644
--- a/StandardPda/MES.Service/Modes/QsItemOqcItem.cs
+++ b/StandardPda/MES.Service/Modes/QsItemOqcItem.cs
@@ -1,6 +1,6 @@
+using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
namespace MES.Service.Modes;
diff --git a/StandardPda/MES.Service/Modes/QsItemOqcItemDetail.cs b/StandardPda/MES.Service/Modes/QsItemOqcItemDetail.cs
index b661544..04d6de7 100644
--- a/StandardPda/MES.Service/Modes/QsItemOqcItemDetail.cs
+++ b/StandardPda/MES.Service/Modes/QsItemOqcItemDetail.cs
@@ -1,6 +1,6 @@
+using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
namespace MES.Service.Modes;
diff --git a/StandardPda/MES.Service/Modes/QsItemOqcReq.cs b/StandardPda/MES.Service/Modes/QsItemOqcReq.cs
index 4183733..b6b7151 100644
--- a/StandardPda/MES.Service/Modes/QsItemOqcReq.cs
+++ b/StandardPda/MES.Service/Modes/QsItemOqcReq.cs
@@ -1,5 +1,5 @@
-using System.ComponentModel.DataAnnotations.Schema;
using SqlSugar;
+using System.ComponentModel.DataAnnotations.Schema;
namespace MES.Service.Modes;
diff --git a/StandardPda/MES.Service/Modes/QsQaItemXj.cs b/StandardPda/MES.Service/Modes/QsQaItemXj.cs
index 28c435a..2c20aba 100644
--- a/StandardPda/MES.Service/Modes/QsQaItemXj.cs
+++ b/StandardPda/MES.Service/Modes/QsQaItemXj.cs
@@ -1,6 +1,6 @@
+using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
namespace MES.Service.Modes;
diff --git a/StandardPda/MES.Service/Modes/QsQaItemXj01.cs b/StandardPda/MES.Service/Modes/QsQaItemXj01.cs
index 95a65e9..e92e83c 100644
--- a/StandardPda/MES.Service/Modes/QsQaItemXj01.cs
+++ b/StandardPda/MES.Service/Modes/QsQaItemXj01.cs
@@ -1,6 +1,6 @@
+using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
namespace MES.Service.Modes;
diff --git a/StandardPda/MES.Service/Modes/QsQaItemXj02.cs b/StandardPda/MES.Service/Modes/QsQaItemXj02.cs
index 02d930c..7af5e23 100644
--- a/StandardPda/MES.Service/Modes/QsQaItemXj02.cs
+++ b/StandardPda/MES.Service/Modes/QsQaItemXj02.cs
@@ -1,6 +1,6 @@
+using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
namespace MES.Service.Modes;
diff --git a/StandardPda/MES.Service/Modes/SysUser.cs b/StandardPda/MES.Service/Modes/SysUser.cs
index fba9fff..fe1a380 100644
--- a/StandardPda/MES.Service/Modes/SysUser.cs
+++ b/StandardPda/MES.Service/Modes/SysUser.cs
@@ -1,6 +1,6 @@
+using SqlSugar;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
-using SqlSugar;
namespace MES.Service.Modes;
diff --git a/StandardPda/MES.Service/Modes/VMesQaItemsDetect01.cs b/StandardPda/MES.Service/Modes/VMesQaItemsDetect01.cs
index f1847a0..71f776c 100644
--- a/StandardPda/MES.Service/Modes/VMesQaItemsDetect01.cs
+++ b/StandardPda/MES.Service/Modes/VMesQaItemsDetect01.cs
@@ -34,5 +34,11 @@
/// 瀵瑰簲瑙嗗浘涓殑 NEW_FNG_DESC 瀛楁
/// </summary>
[SugarColumn(ColumnName = "NEW_FNG_DESC")]
- public string NewFngDesc { get; set; }
+ public string? NewFngDesc { get; set; }
+
+ /// <summary>
+ /// 瀵瑰簲瑙嗗浘涓殑 PROJECT_CODES(椤圭洰) 瀛楁
+ /// </summary>
+ [SugarColumn(ColumnName = "PROJECT_CODES")]
+ public string? ProjectCodes { get; set; }
}
\ No newline at end of file
diff --git a/StandardPda/MES.Service/Modes/Womcab.cs b/StandardPda/MES.Service/Modes/Womcab.cs
index 970af7d..cdc826b 100644
--- a/StandardPda/MES.Service/Modes/Womcab.cs
+++ b/StandardPda/MES.Service/Modes/Womcab.cs
@@ -213,7 +213,7 @@
[SugarColumn(ColumnName = "TYPEB", Length = 2)]
public string? TypeB { get; set; }
-
+
/// <summary>
/// 瀛愰」绫诲瀷锛�1-鏍囧噯浠� 2-杩旇繕浠� 3-鏇夸唬浠讹級
/// </summary>
diff --git a/StandardPda/MES.Service/service/BasicData/MesRohInDataManager.cs b/StandardPda/MES.Service/service/BasicData/MesRohInDataManager.cs
index 7385023..d0dd054 100644
--- a/StandardPda/MES.Service/service/BasicData/MesRohInDataManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/MesRohInDataManager.cs
@@ -38,7 +38,8 @@
conModels.Add(new ConditionalModel
{
FieldName = typeof(MesRohInData).GetProperties()[0].Name,
- ConditionalType = ConditionalType.Equal, FieldValue = "1"
+ ConditionalType = ConditionalType.Equal,
+ FieldValue = "1"
}); //id=1
var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
diff --git a/StandardPda/MES.Service/service/BasicData/OrganizeManager.cs b/StandardPda/MES.Service/service/BasicData/OrganizeManager.cs
index e6f254f..a904722 100644
--- a/StandardPda/MES.Service/service/BasicData/OrganizeManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/OrganizeManager.cs
@@ -225,7 +225,8 @@
conModels.Add(new ConditionalModel
{
FieldName = typeof(Organize).GetProperties()[0].Name,
- ConditionalType = ConditionalType.Equal, FieldValue = "1"
+ ConditionalType = ConditionalType.Equal,
+ FieldValue = "1"
}); //id=1
var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
diff --git a/StandardPda/MES.Service/service/BasicData/ProductionOrderManager.cs b/StandardPda/MES.Service/service/BasicData/ProductionOrderManager.cs
index a336849..09d54d7 100644
--- a/StandardPda/MES.Service/service/BasicData/ProductionOrderManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/ProductionOrderManager.cs
@@ -1,8 +1,8 @@
-锘縰sing System.Globalization;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
+using System.Globalization;
namespace MES.Service.service.BasicData;
diff --git a/StandardPda/MES.Service/service/BasicData/ProductionOrderSubManager.cs b/StandardPda/MES.Service/service/BasicData/ProductionOrderSubManager.cs
index f2eee3e..ea3532d 100644
--- a/StandardPda/MES.Service/service/BasicData/ProductionOrderSubManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/ProductionOrderSubManager.cs
@@ -38,7 +38,8 @@
conModels.Add(new ConditionalModel
{
FieldName = typeof(ProductionOrderSub).GetProperties()[0].Name,
- ConditionalType = ConditionalType.Equal, FieldValue = "1"
+ ConditionalType = ConditionalType.Equal,
+ FieldValue = "1"
}); //id=1
var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
diff --git a/StandardPda/MES.Service/service/BasicData/SalesOrderDetailManager.cs b/StandardPda/MES.Service/service/BasicData/SalesOrderDetailManager.cs
index d80f479..99d315f 100644
--- a/StandardPda/MES.Service/service/BasicData/SalesOrderDetailManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/SalesOrderDetailManager.cs
@@ -38,7 +38,8 @@
conModels.Add(new ConditionalModel
{
FieldName = typeof(SalesOrderDetail).GetProperties()[0].Name,
- ConditionalType = ConditionalType.Equal, FieldValue = "1"
+ ConditionalType = ConditionalType.Equal,
+ FieldValue = "1"
}); //id=1
var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
diff --git a/StandardPda/MES.Service/service/BasicData/SalesOrderManager.cs b/StandardPda/MES.Service/service/BasicData/SalesOrderManager.cs
index b466f00..7017bb6 100644
--- a/StandardPda/MES.Service/service/BasicData/SalesOrderManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/SalesOrderManager.cs
@@ -38,7 +38,8 @@
conModels.Add(new ConditionalModel
{
FieldName = typeof(SalesOrder).GetProperties()[0].Name,
- ConditionalType = ConditionalType.Equal, FieldValue = "1"
+ ConditionalType = ConditionalType.Equal,
+ FieldValue = "1"
}); //id=1
var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
diff --git a/StandardPda/MES.Service/service/BasicData/SalesReturnNoticeDetailManager.cs b/StandardPda/MES.Service/service/BasicData/SalesReturnNoticeDetailManager.cs
index 78d4c7b..eb3e4d8 100644
--- a/StandardPda/MES.Service/service/BasicData/SalesReturnNoticeDetailManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/SalesReturnNoticeDetailManager.cs
@@ -39,7 +39,8 @@
conModels.Add(new ConditionalModel
{
FieldName = typeof(SalesReturnNoticeDetail).GetProperties()[0].Name,
- ConditionalType = ConditionalType.Equal, FieldValue = "1"
+ ConditionalType = ConditionalType.Equal,
+ FieldValue = "1"
}); //id=1
var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
diff --git a/StandardPda/MES.Service/service/BasicData/ShipmentDetailManager.cs b/StandardPda/MES.Service/service/BasicData/ShipmentDetailManager.cs
index 67c9435..d31adac 100644
--- a/StandardPda/MES.Service/service/BasicData/ShipmentDetailManager.cs
+++ b/StandardPda/MES.Service/service/BasicData/ShipmentDetailManager.cs
@@ -38,7 +38,8 @@
conModels.Add(new ConditionalModel
{
FieldName = typeof(ShipmentDetail).GetProperties()[0].Name,
- ConditionalType = ConditionalType.Equal, FieldValue = "1"
+ ConditionalType = ConditionalType.Equal,
+ FieldValue = "1"
}); //id=1
var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
diff --git a/StandardPda/MES.Service/service/LoginService.cs b/StandardPda/MES.Service/service/LoginService.cs
index be647dc..55a7795 100644
--- a/StandardPda/MES.Service/service/LoginService.cs
+++ b/StandardPda/MES.Service/service/LoginService.cs
@@ -1,6 +1,6 @@
-锘縰sing System.Data;
+锘縰sing MES.Service.DB;
+using System.Data;
using System.Text;
-using MES.Service.DB;
namespace MES.Service.service;
diff --git a/StandardPda/MES.Service/service/MessageCenterManager.cs b/StandardPda/MES.Service/service/MessageCenterManager.cs
index b377f2d..1f78d30 100644
--- a/StandardPda/MES.Service/service/MessageCenterManager.cs
+++ b/StandardPda/MES.Service/service/MessageCenterManager.cs
@@ -42,7 +42,10 @@
return Context.Queryable<MessageCenter>()
.GroupBy(a => new
{
- a.TableName, a.Pid, a.Title, a.PageName
+ a.TableName,
+ a.Pid,
+ a.Title,
+ a.PageName
})
.Where(a =>
a.DealWith == 0 && a.Status == 0 && a.Result == 0 &&
diff --git a/StandardPda/MES.Service/service/QC/LljService.cs b/StandardPda/MES.Service/service/QC/LljService.cs
index 3377af4..fc972d3 100644
--- a/StandardPda/MES.Service/service/QC/LljService.cs
+++ b/StandardPda/MES.Service/service/QC/LljService.cs
@@ -1,11 +1,13 @@
-锘縰sing System.Data;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
using MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.util;
using Newtonsoft.Json;
+using SharpCompress.Factories;
using SqlSugar;
+using System.Data;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
using DbType = System.Data.DbType;
@@ -47,21 +49,24 @@
//.WhereIF(
// itemIds is { Length: > 0 },
// (a, b, c) => itemIds.Contains(a.ItemId))
- .WhereIF(id > 0, (a, b, d) => a.Id == id )
- .WhereIF(true, (a, b,d, e,f,g) => (g.Fcode == queryObj.createUser || g.Fcode == null))
+ .WhereIF(id > 0, (a, b, d) => a.Id == id)
+ .WhereIF(true, (a, b, d, e, f, g) => (g.Fcode == queryObj.createUser || g.Fcode == null))
//鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉版悳绱�
//.WhereIF(queryObj.SearchValue!=null && queryObj.SearchValue!="", (a) => a.SuppName == queryObj.SearchValue|| a.ItemName == queryObj.SearchValue || a.ItemNo == queryObj.SearchValue )
- .WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
- (a) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())
- || a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
- || a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())))
+ .WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
+ (a, b, d) => (a.SuppName.ToLower().Contains(queryObj.SearchValue.ToLower())
+ || a.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
+ || a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())
+ || d.ProjectCodes.ToLower().Contains(queryObj.SearchValue.ToLower())
+ ))
.OrderByDescending((a, b, d) => a.Id)
.Select((a, b, d, e, f, g) => new LtsLlj
{
UserName = g.Fname,
FIRST = d.First,
CreateUserName = e.Fname,
- NewFngDesc = d.NewFngDesc
+ NewFngDesc = d.NewFngDesc,
+ ProjectCodes = d.ProjectCodes
}, true)
.ToPageList(queryObj.PageIndex, queryObj.Limit, ref totalCount);
@@ -94,98 +99,139 @@
//鏍规嵁妫�楠屾爣鍑嗘潵璁＄畻妫�楠屼釜鏁�
- public List<MesQaItemsDetectDetail5> SetItems(string itemNo,
+ //public List<MesQaItemsDetectDetail5> SetItems(string itemNo,
+ // decimal quantity, string releaseNo)
+ //{
+ // var db = SqlSugarHelper.GetInstance();
+
+
+ // var count = db.Queryable<MesQaIqc>().Where(s => s.EE == 1 &&
+ // s.ISENABLED == 1
+ // && s.ItemNo == itemNo && s.FTYPE == "1").Count();
+
+ // if (count <= 0) return [];
+
+ // var mesQaIqcItem = db
+ // .Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1
+ // && s.ItemNo == itemNo && s.FTYPE == "1").Select(
+ // b => new MesQaItemsDetectDetail5
+ // {
+ // ReleaseNo = releaseNo,
+ // FacLevel = b.FacLevel,
+ // FcheckItem = b.FcheckItem,
+ // FdownAllow = b.FdownAllow,
+ // FcheckLevel = b.FREQUENCY,
+ // Fstand = b.FSTAND,
+ // FupAllow = b.FupAllow,
+ // SampleSizeNo = b.SampleSizeNo,
+ // FenterQty = 0,
+ // Factory = "1000",
+ // Company = "1000",
+
+
+ // // FcheckItemDesc = "0",
+ // // FcheckResu = "0",
+ // FcheckTool = b.FcheckTool,
+ // FspecRequ = b.FspecRequ
+ // // FtextType = "0",
+ // // Funit = "0",
+ // // LastupdateBy = "0",
+ // // ProcNo = "0",
+ // // WorkshopCenterCode = "0"
+ // }).ToList();
+
+ // mesQaIqcItem.ForEach(item =>
+ // {
+ // var LEV = item.FcheckLevel switch
+ // {
+ // null => "" // 榛樿鍊�
+ // ,
+ // { } s when s.Contains("S1") => "B.FLEVEL_S1",
+ // { } s when s.Contains("S2") => "B.FLEVEL_S2",
+ // { } s when s.Contains("S3") => "B.FLEVEL_S3",
+ // { } s when s.Contains("S4") => "B.FLEVEL_S4",
+ // { } s when s.Contains("(I)") => "B.FLEVEL_I",
+ // { } s when s.Contains("(II)") => "B.FLEVEL_II",
+ // { } s when s.Contains("(III)") => "B.FLEVEL_III",
+ // _ => ""
+ // };
+
+ // if (string.IsNullOrEmpty(LEV))
+ // throw new Exception(item.SampleSizeNo + "鐨勬楠屾按骞充笉姝ｇ‘");
+
+ // var sql =
+ // "SELECT " + LEV +
+ // " FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL2 B ON B.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO='" +
+ // item.SampleSizeNo + "' AND B.LOT_FROM<= " + quantity +
+ // " AND " +
+ // quantity + "<=B.LOT_TO";
+
+ // var maxBillNo = db.Ado.SqlQuerySingle<string>(sql);
+
+ // if (string.IsNullOrEmpty(maxBillNo))
+ // throw new Exception(item.SampleSizeNo + "涓嬬殑" + quantity +
+ // "杩欎釜鑼冨洿涓嬫病鏈夊尮閰嶅埌妫�楠岄」鐩�");
+
+ // var result = ExtractSubstring(item.FacLevel, '(', ')');
+
+ // if (string.IsNullOrEmpty(result))
+ // throw new Exception(item.SampleSizeNo + "涓嬬殑" + quantity +
+ // "鎷掓敹姘村钩涓嶆纭�");
+
+ // sql = "SELECT FSAMPLE_SIZE_WORD, " + result +
+ // " Result FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL3 C ON C.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO= '" +
+ // item.SampleSizeNo + "' AND SAMPLE_SIZE_WORD= '" + maxBillNo +
+ // "'";
+ // var resultClass = db.Ado.SqlQuerySingle<ResultClass>(sql);
+
+ // item.CheckQyt = resultClass.FSAMPLE_SIZE_WORD;
+ // item.FreQty = resultClass.Result;
+ // });
+
+ // return mesQaIqcItem;
+ //}
+
+
+ //鏍规嵁妫�楠屾爣鍑嗘潵璁＄畻妫�楠屼釜鏁�
+ public string[] SetItems(string itemNo,
decimal quantity, string releaseNo)
{
+ // 瀹氫箟杈撳嚭鍙傛暟
+ var outputResult = new SugarParameter("o_Result", null,
+ DbType.Int32, ParameterDirection.Output,
+ 4000);
+
+ var outputMessage = new SugarParameter("o_Msg", null,
+ DbType.String,
+ ParameterDirection.Output, 4000);
+
+ // 瀹氫箟杈撳叆鍙傛暟
+ var parameters = new List<SugarParameter>
+ {
+ new("P_RELEASE_NO", releaseNo,
+ DbType.String, ParameterDirection.Input),
+ outputResult,
+ outputMessage
+ };
+
var db = SqlSugarHelper.GetInstance();
+ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+ db.Ado.ExecuteCommand(
+ "BEGIN PRC_QA_ITEM_INSERT_BTN(:P_RELEASE_NO, :o_Result, :o_Msg); END;",
+ parameters.ToArray());
- var count = db.Queryable<MesQaIqc>().Where(s => s.EE == 1 &&
- s.ISENABLED == 1
- && s.ItemNo == itemNo && s.FTYPE == "1").Count();
-
- if (count <= 0) return [];
-
- var mesQaIqcItem = db
- .Queryable<MesQaIqc>().Where(s => s.EE == 1 && s.ISENABLED == 1
- && s.ItemNo == itemNo && s.FTYPE == "1").Select(
- b => new MesQaItemsDetectDetail5
- {
- ReleaseNo = releaseNo,
- FacLevel = b.FacLevel,
- FcheckItem = b.FcheckItem,
- FdownAllow = b.FdownAllow,
- FcheckLevel = b.FREQUENCY,
- Fstand = b.FSTAND,
- FupAllow = b.FupAllow,
- SampleSizeNo = b.SampleSizeNo,
- FenterQty = 0,
- Factory = "1000",
- Company = "1000",
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+ var resultValue = outputResult.Value?.ToString();
+ var messageValue = outputMessage.Value?.ToString();
+ string[] msg = new string[2];
+ msg[0] = resultValue;
+ msg[1] = messageValue;
+ return msg;
- // FcheckItemDesc = "0",
- // FcheckResu = "0",
- FcheckTool = b.FcheckTool,
- FspecRequ = b.FspecRequ
- // FtextType = "0",
- // Funit = "0",
- // LastupdateBy = "0",
- // ProcNo = "0",
- // WorkshopCenterCode = "0"
- }).ToList();
- mesQaIqcItem.ForEach(item =>
- {
- var LEV = item.FcheckLevel switch
- {
- null => "" // 榛樿鍊�
- ,
- { } s when s.Contains("S1") => "B.FLEVEL_S1",
- { } s when s.Contains("S2") => "B.FLEVEL_S2",
- { } s when s.Contains("S3") => "B.FLEVEL_S3",
- { } s when s.Contains("S4") => "B.FLEVEL_S4",
- { } s when s.Contains("(I)") => "B.FLEVEL_I",
- { } s when s.Contains("(II)") => "B.FLEVEL_II",
- { } s when s.Contains("(III)") => "B.FLEVEL_III",
- _ => ""
- };
-
- if (string.IsNullOrEmpty(LEV))
- throw new Exception(item.SampleSizeNo + "鐨勬楠屾按骞充笉姝ｇ‘");
-
- var sql =
- "SELECT " + LEV +
- " FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL2 B ON B.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO='" +
- item.SampleSizeNo + "' AND B.LOT_FROM<= " + quantity +
- " AND " +
- quantity + "<=B.LOT_TO";
-
- var maxBillNo = db.Ado.SqlQuerySingle<string>(sql);
-
- if (string.IsNullOrEmpty(maxBillNo))
- throw new Exception(item.SampleSizeNo + "涓嬬殑" + quantity +
- "杩欎釜鑼冨洿涓嬫病鏈夊尮閰嶅埌妫�楠岄」鐩�");
-
- var result = ExtractSubstring(item.FacLevel, '(', ')');
-
- if (string.IsNullOrEmpty(result))
- throw new Exception(item.SampleSizeNo + "涓嬬殑" + quantity +
- "鎷掓敹姘村钩涓嶆纭�");
-
- sql = "SELECT FSAMPLE_SIZE_WORD, " + result +
- " Result FROM MES_QM_AQL1 A LEFT JOIN MES_QM_AQL3 C ON C.AQL1_ID=A.ID WHERE A.SAMPLE_SIZE_NO= '" +
- item.SampleSizeNo + "' AND SAMPLE_SIZE_WORD= '" + maxBillNo +
- "'";
- var resultClass = db.Ado.SqlQuerySingle<ResultClass>(sql);
-
- item.CheckQyt = resultClass.FSAMPLE_SIZE_WORD;
- item.FreQty = resultClass.Result;
- });
-
- return mesQaIqcItem;
}
-
private string ExtractSubstring(string input, char startChar, char endChar)
{
var startIndex = input.IndexOf(startChar);
@@ -526,7 +572,7 @@
return withOracle;
}
-//鏇存柊妫�楠屾槑缁嗗凡妫�銆佷笉鍚堟牸鏁伴噺
+ //鏇存柊妫�楠屾槑缁嗗凡妫�銆佷笉鍚堟牸鏁伴噺
private int updateDetail5(MesQaItemsDetectDetail12 detail)
{
var db = SqlSugarHelper.GetInstance();
diff --git a/StandardPda/MES.Service/service/QC/RKJService.cs b/StandardPda/MES.Service/service/QC/RKJService.cs
index 20008bb..ef3aa9d 100644
--- a/StandardPda/MES.Service/service/QC/RKJService.cs
+++ b/StandardPda/MES.Service/service/QC/RKJService.cs
@@ -453,7 +453,9 @@
.Select((a, b, c) =>
new
{
- a.Id, a.BillNo, c.Daa001
+ a.Id,
+ a.BillNo,
+ c.Daa001
})
.ToList();
@@ -469,7 +471,7 @@
JoinType.Left, a.Id == b.ItemInId))
.Where((a, b) => a.BillNo == qsItemOqcReq.BillNo)
.Select((a, b) => new
- { b.ItemBarcode, b.Quantity, b.MesScgdGxId })
+ { b.ItemBarcode, b.Quantity, b.MesScgdGxId })
.ToList();
var barCodes = mesInvItemInsList.Select(s => s.ItemBarcode).ToList();
@@ -598,7 +600,7 @@
JoinType.Left, c.Id == m.ItemInId && a.ItemNo == m.ItemNo,
JoinType.Left, da.Daa001 == c.RbillNo,
JoinType.Left, da.Daa015 == z.LineNo //,
- //JoinType.Left,c.Bgr == d.UserNo
+ //JoinType.Left,c.Bgr == d.UserNo
))
// .WhereIF(lineNo != null && lineNo.Length > 0,
// (a, b, c, ca, m, da) => lineNo.Contains(da.Daa015))
diff --git a/StandardPda/MES.Service/service/QC/SJService.cs b/StandardPda/MES.Service/service/QC/SJService.cs
index db188ef..42f6757 100644
--- a/StandardPda/MES.Service/service/QC/SJService.cs
+++ b/StandardPda/MES.Service/service/QC/SJService.cs
@@ -222,7 +222,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)[0];
return item;
diff --git a/StandardPda/MES.Service/service/QC/SuspendService.cs b/StandardPda/MES.Service/service/QC/SuspendService.cs
index ce48de9..f2cf91b 100644
--- a/StandardPda/MES.Service/service/QC/SuspendService.cs
+++ b/StandardPda/MES.Service/service/QC/SuspendService.cs
@@ -23,7 +23,8 @@
statusArray.Contains(a.Daa018))
.GroupBy((a, b, c, d) => new
{
- b.Departmentcode, d.Departmentname
+ b.Departmentcode,
+ d.Departmentname
})
.Select((a, b, c, d) => new SysDepartment
{
@@ -45,7 +46,8 @@
&& b.Departmentcode == deptCode)
.GroupBy((a, b, c) => new
{
- b.LineNo, b.LineName
+ b.LineNo,
+ b.LineName
})
.Select((a, b, c) => new MesLine
{
diff --git a/StandardPda/MES.Service/service/QC/XJService.cs b/StandardPda/MES.Service/service/QC/XJService.cs
index 9ed2beb..d618485 100644
--- a/StandardPda/MES.Service/service/QC/XJService.cs
+++ b/StandardPda/MES.Service/service/QC/XJService.cs
@@ -61,7 +61,8 @@
statusArray.Contains(a.Daa018))
.GroupBy((a, b) => new
{
- b.LineNo, b.LineName
+ b.LineNo,
+ b.LineName
})
.Select((a, b) => new MesLine
{
diff --git a/StandardPda/MESApplication/Controllers/Base/LoginController.cs b/StandardPda/MESApplication/Controllers/Base/LoginController.cs
index aede14c..093741e 100644
--- a/StandardPda/MESApplication/Controllers/Base/LoginController.cs
+++ b/StandardPda/MESApplication/Controllers/Base/LoginController.cs
@@ -1,9 +1,9 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.@base;
+锘縰sing MES.Service.Dto.@base;
using MES.Service.service;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
+using System.Dynamic;
namespace MESApplication.Controllers.Base;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/EmployeeInfoController.cs b/StandardPda/MESApplication/Controllers/BasicData/EmployeeInfoController.cs
index ad17725..6de5f15 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/EmployeeInfoController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/EmployeeInfoController.cs
@@ -1,5 +1,4 @@
-锘縰sing System.Dynamic;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -7,6 +6,7 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MESProductionNoticeController.cs b/StandardPda/MESApplication/Controllers/BasicData/MESProductionNoticeController.cs
index 7659e40..8428a52 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MESProductionNoticeController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MESProductionNoticeController.cs
@@ -1,10 +1,10 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.webApi;
+锘縰sing MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesCustomerController.cs b/StandardPda/MESApplication/Controllers/BasicData/MesCustomerController.cs
index 65fe980..32d80c2 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MesCustomerController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesCustomerController.cs
@@ -1,5 +1,4 @@
-锘縰sing System.Dynamic;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -7,6 +6,7 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs b/StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs
index 6154c2e..91c5c82 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteBarcodeController.cs
@@ -1,11 +1,11 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.webApi;
+锘縰sing MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteController.cs b/StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteController.cs
index 28ac2b5..1c0e458 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesDeliveryNoteController.cs
@@ -1,11 +1,11 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.webApi;
+锘縰sing MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesDepotsController.cs b/StandardPda/MESApplication/Controllers/BasicData/MesDepotsController.cs
index 3a20310..7504e4d 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MesDepotsController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesDepotsController.cs
@@ -1,11 +1,11 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.webApi;
+锘縰sing MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesItemTypeController.cs b/StandardPda/MESApplication/Controllers/BasicData/MesItemTypeController.cs
index 5ea2023..1b57692 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MesItemTypeController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesItemTypeController.cs
@@ -1,5 +1,4 @@
-锘縰sing System.Dynamic;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -7,6 +6,7 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesItemsController.cs b/StandardPda/MESApplication/Controllers/BasicData/MesItemsController.cs
index 5c4d4d5..2a5ca0a 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MesItemsController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesItemsController.cs
@@ -1,5 +1,4 @@
-锘縰sing System.Dynamic;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -7,6 +6,7 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesPositionController.cs b/StandardPda/MESApplication/Controllers/BasicData/MesPositionController.cs
index 34964d9..e8ddf22 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MesPositionController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesPositionController.cs
@@ -1,5 +1,4 @@
-锘縰sing System.Dynamic;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -7,6 +6,7 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs b/StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs
index af34ef3..2c76743 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesProjectController.cs
@@ -1,5 +1,4 @@
-锘縰sing System.Dynamic;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -7,6 +6,7 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesRohInController.cs b/StandardPda/MESApplication/Controllers/BasicData/MesRohInController.cs
index 6e5c8d1..f554b31 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MesRohInController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesRohInController.cs
@@ -1,11 +1,11 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.webApi;
+锘縰sing MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesRohInDataController.cs b/StandardPda/MESApplication/Controllers/BasicData/MesRohInDataController.cs
index aff8ba6..54e7f8c 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MesRohInDataController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesRohInDataController.cs
@@ -1,8 +1,8 @@
-锘縰sing System.Dynamic;
-using MES.Service.Modes;
+锘縰sing MES.Service.Modes;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesStaffController.cs b/StandardPda/MESApplication/Controllers/BasicData/MesStaffController.cs
index 3935d79..4a8b9f6 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MesStaffController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesStaffController.cs
@@ -1,11 +1,11 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.webApi;
+锘縰sing MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesSupplierController.cs b/StandardPda/MESApplication/Controllers/BasicData/MesSupplierController.cs
index 8955184..f667278 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MesSupplierController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesSupplierController.cs
@@ -1,5 +1,4 @@
-锘縰sing System.Dynamic;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -7,6 +6,7 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/MesUnitController.cs b/StandardPda/MESApplication/Controllers/BasicData/MesUnitController.cs
index e4b505e..77d7954 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/MesUnitController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/MesUnitController.cs
@@ -1,5 +1,4 @@
-锘縰sing System.Dynamic;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -7,6 +6,7 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/OrganizeController.cs b/StandardPda/MESApplication/Controllers/BasicData/OrganizeController.cs
index 9d0a8a0..3bf2801 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/OrganizeController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/OrganizeController.cs
@@ -1,5 +1,4 @@
-锘縰sing System.Dynamic;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -7,6 +6,7 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/ProductionOrderController.cs b/StandardPda/MESApplication/Controllers/BasicData/ProductionOrderController.cs
index c031865..cc4c334 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/ProductionOrderController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/ProductionOrderController.cs
@@ -1,11 +1,11 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.webApi;
+锘縰sing MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.service.BasicData;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/BasicData/SysDepartmentController.cs b/StandardPda/MESApplication/Controllers/BasicData/SysDepartmentController.cs
index 4b5c2f1..dcf06df 100644
--- a/StandardPda/MESApplication/Controllers/BasicData/SysDepartmentController.cs
+++ b/StandardPda/MESApplication/Controllers/BasicData/SysDepartmentController.cs
@@ -1,5 +1,4 @@
-锘縰sing System.Dynamic;
-using Masuit.Tools;
+锘縰sing Masuit.Tools;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using MES.Service.service;
@@ -7,6 +6,7 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
+using System.Dynamic;
namespace MESApplication.Controllers.BasicData;
diff --git a/StandardPda/MESApplication/Controllers/QC/BaseController.cs b/StandardPda/MESApplication/Controllers/QC/BaseController.cs
index dd54e7f..ef2d9f2 100644
--- a/StandardPda/MESApplication/Controllers/QC/BaseController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/BaseController.cs
@@ -1,9 +1,9 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.service;
+锘縰sing MES.Service.Dto.service;
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
+using System.Dynamic;
namespace MESApplication.Controllers.QC;
diff --git a/StandardPda/MESApplication/Controllers/QC/LljController.cs b/StandardPda/MESApplication/Controllers/QC/LljController.cs
index e5df8ef..5e1b71e 100644
--- a/StandardPda/MESApplication/Controllers/QC/LljController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/LljController.cs
@@ -1,10 +1,10 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.service;
+锘縰sing MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
+using System.Dynamic;
namespace MESApplication.Controllers.QC;
@@ -45,14 +45,14 @@
try
{
dynamic resultInfos = new ExpandoObject();
- var tbBillList =
- new LljService().SetItems(itemNo, quantity, releaseNo);
- resultInfos.tbBillList = tbBillList;
+
+ string[] msg= new LljService().SetItems(itemNo, quantity, releaseNo);
+
return new ResponseResult
{
- status = 0,
- message = "OK",
- data = resultInfos
+ status = int.Parse(msg[0]),
+ message = msg[1],
+ data = msg[1]
};
}
catch (Exception ex)
@@ -285,7 +285,7 @@
dynamic resultInfos = new ExpandoObject();
var lljService = new LljService();
var tbBillList = await lljService.GetFileUrlByU9List(type, itemID);
- if (tbBillList!=null)
+ if (tbBillList != null)
{
return new ResponseResult
{
@@ -303,7 +303,7 @@
data = ""
};
}
-
+
}
catch (Exception ex)
{
diff --git a/StandardPda/MESApplication/Controllers/QC/RKJController.cs b/StandardPda/MESApplication/Controllers/QC/RKJController.cs
index 427250f..7b8c126 100644
--- a/StandardPda/MESApplication/Controllers/QC/RKJController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/RKJController.cs
@@ -1,10 +1,10 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.service;
+锘縰sing MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
+using System.Dynamic;
namespace MESApplication.Controllers.QC;
diff --git a/StandardPda/MESApplication/Controllers/QC/SJController.cs b/StandardPda/MESApplication/Controllers/QC/SJController.cs
index 107d6b9..d76bb89 100644
--- a/StandardPda/MESApplication/Controllers/QC/SJController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/SJController.cs
@@ -1,10 +1,10 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.service;
+锘縰sing MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
+using System.Dynamic;
namespace MESApplication.Controllers.QC;
diff --git a/StandardPda/MESApplication/Controllers/QC/SuspendController.cs b/StandardPda/MESApplication/Controllers/QC/SuspendController.cs
index ff980df..f93f18e 100644
--- a/StandardPda/MESApplication/Controllers/QC/SuspendController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/SuspendController.cs
@@ -1,9 +1,9 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.service;
+锘縰sing MES.Service.Dto.service;
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
+using System.Dynamic;
namespace MESApplication.Controllers.QC;
diff --git a/StandardPda/MESApplication/Controllers/QC/XJController.cs b/StandardPda/MESApplication/Controllers/QC/XJController.cs
index ef25d6b..37e09dd 100644
--- a/StandardPda/MESApplication/Controllers/QC/XJController.cs
+++ b/StandardPda/MESApplication/Controllers/QC/XJController.cs
@@ -1,10 +1,10 @@
-锘縰sing System.Dynamic;
-using MES.Service.Dto.service;
+锘縰sing MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service.QC;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
+using System.Dynamic;
namespace MESApplication.Controllers.QC;
diff --git a/StandardPda/MESApplication/Filter/ActionFilter.cs b/StandardPda/MESApplication/Filter/ActionFilter.cs
index 07166f2..a98b6e9 100644
--- a/StandardPda/MESApplication/Filter/ActionFilter.cs
+++ b/StandardPda/MESApplication/Filter/ActionFilter.cs
@@ -1,9 +1,9 @@
-锘縰sing System.Diagnostics;
-using System.Text;
-using Microsoft.AspNetCore.Mvc;
+锘縰sing Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Mvc.Filters;
using Newtonsoft.Json;
+using System.Diagnostics;
+using System.Text;
namespace MESApplication.Filter;
diff --git a/StandardPda/MESApplication/Startup.cs b/StandardPda/MESApplication/Startup.cs
index b764775..a0c95ac 100644
--- a/StandardPda/MESApplication/Startup.cs
+++ b/StandardPda/MESApplication/Startup.cs
@@ -1,11 +1,11 @@
-锘縰sing System.Reflection;
-using MES.Service.Dto.@base;
+锘縰sing MES.Service.Dto.@base;
using MES.Service.util;
using MESApplication.Filter;
using Microsoft.OpenApi.Models;
using Newtonsoft.Json;
using Newtonsoft.Json.Serialization;
using Swashbuckle.AspNetCore.SwaggerUI;
+using System.Reflection;
namespace MESApplication;
@@ -36,7 +36,7 @@
{
c.SwaggerDoc("v1",
new OpenApiInfo
- { Title = "MESApplication.Api", Version = "v1" });
+ { Title = "MESApplication.Api", Version = "v1" });
var xmlFile =
$"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
--
Gitblit v1.9.3