From eca1997ccfba38457400c19f36781bef243e83a8 Mon Sep 17 00:00:00 2001
From: sjz <1240968267@qq.com>
Date: 星期六, 10 五月 2025 09:24:55 +0800
Subject: [PATCH] 最新
---
StandardInterface/MES.Service/service/SRM/MesDeliveryNoteBarcodeManager.cs | 1
StandardInterface/MES.Service/Modes/MesItems.cs | 16 --------
StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs | 6 +-
StandardInterface/MES.Service/Modes/QcIssueResult/QcIssueResults.cs | 48 +++---------------------
StandardInterface/MES.Service/service/QC/LljService.cs | 3 +
StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs | 3 -
6 files changed, 12 insertions(+), 65 deletions(-)
diff --git a/StandardInterface/MES.Service/Modes/MesItems.cs b/StandardInterface/MES.Service/Modes/MesItems.cs
index bd6cf87..afa7d7d 100644
--- a/StandardInterface/MES.Service/Modes/MesItems.cs
+++ b/StandardInterface/MES.Service/Modes/MesItems.cs
@@ -488,20 +488,4 @@
[SugarColumn(ColumnName = "MJBM")]
public string? MJBM { get; set; }
- /// <summary>
- /// 瀹㈡埛鐗╂枡缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "KHWLBM")]
- public string? KHWLBM { get; set; }
- /// <summary>
- /// 棰滆壊
- /// </summary>
- [SugarColumn(ColumnName = "YS")]
- public string? YS { get; set; }
- /// <summary>
- /// 涓嬮亾宸ュ簭
- /// </summary>
- [SugarColumn(ColumnName = "NEXT_GX")]
- public string? Next_Gx { get; set; }
-
}
\ No newline at end of file
diff --git a/StandardInterface/MES.Service/Modes/QcIssueResult/QcIssueResults.cs b/StandardInterface/MES.Service/Modes/QcIssueResult/QcIssueResults.cs
index 482615d..e17e4f8 100644
--- a/StandardInterface/MES.Service/Modes/QcIssueResult/QcIssueResults.cs
+++ b/StandardInterface/MES.Service/Modes/QcIssueResult/QcIssueResults.cs
@@ -15,56 +15,20 @@
[SugarColumn(ColumnName = "ID", IsPrimaryKey = true, OracleSequenceName = "SEQ_QCISSUE_RESULT")]
public decimal Id { get; set; }
- //鏉ユ枡妫�楠屽崟鍙�
+ //閫佽揣鍗曞彿
[SugarColumn(ColumnName = "RELEASE_NO")]
public string? ReleaseNo { get; set; }
- //娴佺▼鍙�
- [SugarColumn(ColumnName = "INSTANCEID")]
- public string? INSTANCEID { get; set; }
+ //閫佽揣鍗曞彿
+ [SugarColumn(ColumnName = "PROCESSNO")]
+ public string? ProcessNo { get; set; }
- //澶勭悊缁撴灉
+ //渚涘簲鍟�
[SugarColumn(ColumnName = "FREVIEW")]
public string? FReview { get; set; }
- //寮傚父澶勭疆鍗曟槸鍚﹁鎷掔粷
+ //渚涘簲鍟�
[SugarColumn(ColumnName = "QCSTATU")]
public string? QcStatu { get; set; }
-
- //鐢宠鏁伴噺
- [SugarColumn(ColumnName = "APPLICATIONNUM")]
- public string? APPLICATIONNUM { get; set; }
-
- //涓嶈壇鍘熷洜
- [SugarColumn(ColumnName = "BADCAUSES")]
- public string? BADCAUSES { get; set; }
-
- //鎵�灞炶溅闂�
- [SugarColumn(ColumnName = "BELONGINGWORKSHOP")]
- public string? BELONGINGWORKSHOP { get; set; }
-
- //璇勫鐘舵��
- [SugarColumn(ColumnName = "REVIEWSTATUS")]
- public string? REVIEWSTATUS { get; set; }
-
- //鐗╂枡鍚嶇О
- [SugarColumn(ColumnName = "ITEMNAME")]
- public string? ITEMNAME { get; set; }
-
- //鐗╂枡缂栫爜
- [SugarColumn(ColumnName = "ITEMNO")]
- public string? ITEMNO { get; set; }
-
- //渚涘簲鍟嗗悕绉�
- [SugarColumn(ColumnName = "SUPPLIERNAME")]
- public string? SUPPLIERNAME { get; set; }
-
- //澶囨敞
- [SugarColumn(ColumnName = "REMARK")]
- public string? REMARK { get; set; }
-
- //浜у搧璐ㄩ噺鐘跺喌鍙婄敵璇峰師鍥�
- [SugarColumn(ColumnName = "APPLICATIONRESON")]
- public string? APPLICATIONRESON { get; set; }
}
diff --git a/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs b/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs
index 4b8dbc9..f18ff8d 100644
--- a/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Material/MesItemsManager.cs
@@ -219,9 +219,6 @@
F_BZGS =item.F_BZGS,
WLFZMC=item.F_FZMC,
MJBM =item.MJBM,
- KHWLBM =item.KHWLBM,
- YS=item.YS,
- Next_Gx = item.NEXT_GX,
};
}
diff --git a/StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs b/StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs
index 8f3b66b..49bb250 100644
--- a/StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/RawMaterial/MesRohInManager.cs
@@ -94,9 +94,9 @@
.Deleteable<MesRohInData>()
.Where(s => decimals.Contains(s.Id))
.ExecuteCommand() > 0;
- return true;
- /* if (update && insertOrUpdate) return true;
- throw new NotImplementedException("鏇存柊澶辫触");*/
+
+ if (update && insertOrUpdate) return true;
+ throw new NotImplementedException("鏇存柊澶辫触");
}
// 鎻掑叆鎴栨洿鏂版暟鎹殑鏂规硶
diff --git a/StandardInterface/MES.Service/service/QC/LljService.cs b/StandardInterface/MES.Service/service/QC/LljService.cs
index f1f2206..7649b7c 100644
--- a/StandardInterface/MES.Service/service/QC/LljService.cs
+++ b/StandardInterface/MES.Service/service/QC/LljService.cs
@@ -255,7 +255,8 @@
Company = "1000",
FenterQty = SqlFunc.AggregateCount(b.Id),
FcheckResu = a.FcheckResu,
- FcheckItemDesc = a.FcheckItemDesc
+ // FcheckItemDesc = a.FcheckItemDesc
+ FcheckItemDesc = a.FspecRequ
}).ToList();
}
diff --git a/StandardInterface/MES.Service/service/SRM/MesDeliveryNoteBarcodeManager.cs b/StandardInterface/MES.Service/service/SRM/MesDeliveryNoteBarcodeManager.cs
index 5441097..782124d 100644
--- a/StandardInterface/MES.Service/service/SRM/MesDeliveryNoteBarcodeManager.cs
+++ b/StandardInterface/MES.Service/service/SRM/MesDeliveryNoteBarcodeManager.cs
@@ -74,6 +74,7 @@
mesDeliveryBarcode.Id = single.Id;
}
+
mesDeliveryBarcode.DeliveryNo = barcode.DeliveryNo;
mesDeliveryBarcode.ProductCode = barcode.ProductCode;
--
Gitblit v1.9.3