From 2cad690178b5373db94075f9355a390a7eba6a44 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期四, 22 八月 2024 13:53:44 +0800
Subject: [PATCH] 巡检适配
---
MES.Service/service/QC/XJService.cs | 14
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Modes/MesItems.cs | 496 +++++++++++++++++++++-----------------
MES.Service/Modes/QsQaItemXj.cs | 209 +++++++--------
MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs | 4
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/service/Warehouse/OrganizeService.cs | 9
MES.Service/service/BasicData/MesItemsManager.cs | 3
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
13 files changed, 398 insertions(+), 337 deletions(-)
diff --git a/MES.Service/Modes/MesItems.cs b/MES.Service/Modes/MesItems.cs
index c12394c..b82d99c 100644
--- a/MES.Service/Modes/MesItems.cs
+++ b/MES.Service/Modes/MesItems.cs
@@ -1,270 +1,322 @@
-锘縰sing SqlSugar;
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 鐗╂枡淇℃伅
-/// </summary>
-[SugarTable("MES_ITEMS")]
-public class MesItems
+namespace MES.Service.Modes
{
/// <summary>
- /// 鐗╂枡ID
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
+ /// 鐗╂枡淇℃伅
+ ///</summary>
+ [SugarTable("MES_ITEMS")]
+ public class MesItems
+ {
+ /// <summary>
+ /// 鐗╂枡ID
+ ///</summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ public decimal Id { get; set; }
- /// <summary>
- /// 宸ュ巶
- /// </summary>
- [SugarColumn(ColumnName = "FACTORY")]
- public string? Factory { get; set; }
+ /// <summary>
+ /// 宸ュ巶
+ ///</summary>
+ [SugarColumn(ColumnName = "FACTORY")]
+ public string Factory { get; set; }
- /// <summary>
- /// 鍏徃缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "COMPANY")]
- public string? Company { get; set; }
+ /// <summary>
+ /// 鍏徃缂栧彿
+ ///</summary>
+ [SugarColumn(ColumnName = "COMPANY")]
+ public string Company { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜 = ERP鐗╂枡缂栧彿||棰滆壊缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
- public string? ItemNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡缂栫爜 = ERP鐗╂枡缂栧彿||棰滆壊缂栧彿
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
+ public string ItemNo { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_NAME")]
- public string? ItemName { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_NAME")]
+ public string ItemName { get; set; }
- /// <summary>
- /// 鐗╂枡绠�绉�
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_SNAME")]
- public string? ItemSname { get; set; }
+ /// <summary>
+ /// 鐗╂枡绠�绉�
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_SNAME")]
+ public string ItemSname { get; set; }
- /// <summary>
- /// 瑙勬牸鍨嬪彿
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_MODEL")]
- public string? ItemModel { get; set; }
+ /// <summary>
+ /// 瑙勬牸鍨嬪彿
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_MODEL")]
+ public string ItemModel { get; set; }
- /// <summary>
- /// 鐗╂枡鎻忚堪
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_DESCRIPTION")]
- public string? ItemDescription { get; set; }
+ /// <summary>
+ /// 鐗╂枡鎻忚堪
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_DESCRIPTION")]
+ public string ItemDescription { get; set; }
- /// <summary>
- /// 鐗╂枡鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_UNIT")]
- public string? ItemUnit { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_UNIT")]
+ public string ItemUnit { get; set; }
- /// <summary>
- /// 鐗╂枡绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_TYPE")]
- public string? ItemType { get; set; }
+ /// <summary>
+ /// 鐗╂枡绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_TYPE")]
+ public string ItemType { get; set; }
- /// <summary>
- /// 浜у搧鐗堟湰
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_VERSION")]
- public string? ItemVersion { get; set; }
+ /// <summary>
+ /// 浜у搧鐗堟湰
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_VERSION")]
+ public string ItemVersion { get; set; }
- /// <summary>
- /// 瀹㈡埛缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "CUST_NO")]
- public string? CustNo { get; set; }
+ /// <summary>
+ /// 瀹㈡埛缂栧彿
+ ///</summary>
+ [SugarColumn(ColumnName = "CUST_NO")]
+ public string CustNo { get; set; }
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_BY")]
- public string? CreateBy { get; set; }
+ /// <summary>
+ /// 鍒涘缓浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
+ public string CreateBy { get; set; }
- /// <summary>
- /// 鍒涘缓鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
- public DateTime? CreateDate { get; set; }
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public DateTime? CreateDate { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂颁汉
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_BY")]
- public string? LastupdateBy { get; set; }
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ ///</summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ public string LastupdateBy { get; set; }
- /// <summary>
- /// 鏈�鍚庢洿鏂版椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
- public DateTime? LastupdateDate { get; set; }
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ ///</summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ public DateTime? LastupdateDate { get; set; }
- /// <summary>
- /// 鏈�浣庡簱瀛�
- /// </summary>
- [SugarColumn(ColumnName = "LOWLIMIT")]
- public double? Lowlimit { get; set; }
+ /// <summary>
+ /// 鏈�浣庡簱瀛�
+ ///</summary>
+ [SugarColumn(ColumnName = "LOWLIMIT")]
+ public double? Lowlimit { get; set; }
- /// <summary>
- /// 鏈�澶у簱瀛�
- /// </summary>
- [SugarColumn(ColumnName = "HIGHLIMIT")]
- public double? Highlimit { get; set; }
+ /// <summary>
+ /// 鏈�澶у簱瀛�
+ ///</summary>
+ [SugarColumn(ColumnName = "HIGHLIMIT")]
+ public double? Highlimit { get; set; }
- /// <summary>
- /// 鏈�灏忓寘瑁呮暟
- /// </summary>
- [SugarColumn(ColumnName = "PRD_PACK")]
- public double? PrdPack { get; set; }
+ /// <summary>
+ /// 鏈�灏忓寘瑁呮暟
+ ///</summary>
+ [SugarColumn(ColumnName = "PRD_PACK")]
+ public double? PrdPack { get; set; }
- /// <summary>
- /// 璁㈠崟鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "ORDERUNIT")]
- public string? Orderunit { get; set; }
+ /// <summary>
+ /// 璁㈠崟鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "ORDERUNIT")]
+ public string Orderunit { get; set; }
- /// <summary>
- /// 閿�鍞崟浣�
- /// </summary>
- [SugarColumn(ColumnName = "SALEUNIT")]
- public string? Saleunit { get; set; }
+ /// <summary>
+ /// 閿�鍞崟浣�
+ ///</summary>
+ [SugarColumn(ColumnName = "SALEUNIT")]
+ public string Saleunit { get; set; }
- /// <summary>
- /// 搴撴埧鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "STOREUNIT")]
- public string? Storeunit { get; set; }
+ /// <summary>
+ /// 搴撴埧鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "STOREUNIT")]
+ public string Storeunit { get; set; }
- /// <summary>
- /// 鐢熶骇鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCTUNIT")]
- public string? Productunit { get; set; }
+ /// <summary>
+ /// 鐢熶骇鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "PRODUCTUNIT")]
+ public string Productunit { get; set; }
- /// <summary>
- /// 鐗╂枡ID
- /// </summary>
- [SugarColumn(ColumnName = "E_ITEM_ID")]
- public decimal? EItemId { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ ///</summary>
+ [SugarColumn(ColumnName = "E_ITEM_ID")]
+ public decimal? EItemId { get; set; }
- /// <summary>
- /// ERP鏂欏彿
- /// </summary>
- [SugarColumn(ColumnName = "ERP_ITEM_NO")]
- public string? ErpItemNo { get; set; }
+ /// <summary>
+ /// ERP鏂欏彿
+ ///</summary>
+ [SugarColumn(ColumnName = "ERP_ITEM_NO")]
+ public string ErpItemNo { get; set; }
- /// <summary>
- /// 榛樿浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_CODE")]
- public string? DepotCode { get; set; }
+ /// <summary>
+ /// 榛樿浠撳簱
+ ///</summary>
+ [SugarColumn(ColumnName = "DEPOT_CODE")]
+ public string DepotCode { get; set; }
- /// <summary>
- /// 鐗╂枡鍒嗙被缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "PPBOM00019124")]
- public string? Ppbom00019124 { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍒嗙被缂栧彿
+ ///</summary>
+ [SugarColumn(ColumnName = "PPBOM00019124")]
+ public string Ppbom00019124 { get; set; }
- /// <summary>
- /// 鐗╂枡鍒嗙粍
- /// </summary>
- [SugarColumn(ColumnName = "REMARKS")]
- public string? Remarks { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍒嗙粍
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARKS")]
+ public string Remarks { get; set; }
- /// <summary>
- /// 閲囪喘鍛�
- /// </summary>
- [SugarColumn(ColumnName = "FPURCHASERID")]
- public string? Fpurchaserid { get; set; }
+ /// <summary>
+ /// 閲囪喘鍛�
+ ///</summary>
+ [SugarColumn(ColumnName = "FPURCHASERID")]
+ public string Fpurchaserid { get; set; }
- /// <summary>
- /// 绂佺敤鐘舵��
- /// </summary>
- [SugarColumn(ColumnName = "FFORBIDSTATUS")]
- public string? Fforbidstatus { get; set; }
+ /// <summary>
+ /// 绂佺敤鐘舵��
+ ///</summary>
+ [SugarColumn(ColumnName = "FFORBIDSTATUS")]
+ public string Fforbidstatus { get; set; }
- /// <summary>
- /// 鐗╂枡鍒嗙粍
- /// </summary>
- [SugarColumn(ColumnName = "FMATERIALGROUP")]
- public string? Fmaterialgroup { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍒嗙粍
+ ///</summary>
+ [SugarColumn(ColumnName = "FMATERIALGROUP")]
+ public string Fmaterialgroup { get; set; }
- /// <summary>
- /// 瀹屽伐瓒呮敹姣斾緥
- /// </summary>
- [SugarColumn(ColumnName = "FFINISHRECEIPTOVERRATE")]
- public decimal? Ffinishreceiptoverrate { get; set; }
+ /// <summary>
+ /// 瀹屽伐瓒呮敹姣斾緥
+ ///</summary>
+ [SugarColumn(ColumnName = "FFINISHRECEIPTOVERRATE")]
+ public decimal? Ffinishreceiptoverrate { get; set; }
- /// <summary>
- /// 鍙戞枡鏂瑰紡
- /// </summary>
- [SugarColumn(ColumnName = "FISSUETYPE")]
- public string? Fissuetype { get; set; }
+ /// <summary>
+ /// 鍙戞枡鏂瑰紡
+ ///</summary>
+ [SugarColumn(ColumnName = "FISSUETYPE")]
+ public string Fissuetype { get; set; }
- /// <summary>
- /// 鍚敤鎵瑰彿绠＄悊
- /// </summary>
- [SugarColumn(ColumnName = "FISBATCHMANAGE")]
- public int? Fisbatchmanage { get; set; }
+ /// <summary>
+ /// 鍚敤鎵瑰彿绠＄悊
+ ///</summary>
+ [SugarColumn(ColumnName = "FISBATCHMANAGE")]
+ public decimal? Fisbatchmanage { get; set; }
- /// <summary>
- /// 閲囪喘鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "FPURCHASEUNITID")]
- public decimal? Fpurchaseunitid { get; set; }
+ /// <summary>
+ /// 閲囪喘鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "FPURCHASEUNITID")]
+ public string Fpurchaseunitid { get; set; }
- /// <summary>
- /// 鑷畾涔夊瓧娈�1
- /// </summary>
- [SugarColumn(ColumnName = "REMARK1")]
- public string? Remark1 { get; set; }
+ /// <summary>
+ /// 鑷畾涔夊瓧娈�1
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARK1")]
+ public string Remark1 { get; set; }
- /// <summary>
- /// 鑷畾涔夊瓧娈�2
- /// </summary>
- [SugarColumn(ColumnName = "REMARK2")]
- public string? Remark2 { get; set; }
+ /// <summary>
+ /// 鑷畾涔夊瓧娈�2
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARK2")]
+ public string Remark2 { get; set; }
- /// <summary>
- /// 鑷畾涔夊瓧娈�3
- /// </summary>
- [SugarColumn(ColumnName = "REMARK3")]
- public string? Remark3 { get; set; }
+ /// <summary>
+ /// 鑷畾涔夊瓧娈�3
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARK3")]
+ public string Remark3 { get; set; }
- /// <summary>
- /// 鑷畾涔夊瓧娈�4
- /// </summary>
- [SugarColumn(ColumnName = "REMARK4")]
- public string? Remark4 { get; set; }
+ /// <summary>
+ /// 鑷畾涔夊瓧娈�4
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARK4")]
+ public string Remark4 { get; set; }
- /// <summary>
- /// 鑷畾涔夊瓧娈�5
- /// </summary>
- [SugarColumn(ColumnName = "REMARK5")]
- public string? Remark5 { get; set; }
+ /// <summary>
+ /// 鑷畾涔夊瓧娈�5
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARK5")]
+ public string Remark5 { get; set; }
- /// <summary>
- /// 鐢熶骇杞﹂棿
- /// </summary>
- [SugarColumn(ColumnName = "PRODUCTION_WORKSHOP")]
- public string? ProductionWorkshop { get; set; }
+ /// <summary>
+ /// 鐢熶骇杞﹂棿
+ ///</summary>
+ [SugarColumn(ColumnName = "PRODUCTION_WORKSHOP")]
+ public string ProductionWorkshop { get; set; }
- /// <summary>
- /// 鐗╂枡灞炴��
- /// </summary>
- [SugarColumn(ColumnName = "MATERIAL_PROPERTI")]
- public string? MaterialProperti { get; set; }
+ /// <summary>
+ /// 鐗╂枡灞炴��
+ ///</summary>
+ [SugarColumn(ColumnName = "MATERIAL_PROPERTI")]
+ public string MaterialProperti { get; set; }
- [SugarColumn(ColumnName = "PRODUCE_UNIT")]
- public string? ProduceUnit { get; set; }
+ /// <summary>
+ /// 鐢熶骇鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "PRODUCE_UNIT")]
+ public string ProduceUnit { get; set; }
- [SugarColumn(ColumnName = "SUBCON_UNIT")]
- public string? SubconUnit { get; set; }
+ /// <summary>
+ /// 濮斿鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "SUBCON_UNIT")]
+ public string SubconUnit { get; set; }
- [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
+ /// <summary>
+ /// 鍥剧墖1
+ ///</summary>
+ [SugarColumn(ColumnName = "BZ06")]
+ public string Bz06 { get; set; }
+
+ /// <summary>
+ /// 鍥剧墖2
+ ///</summary>
+ [SugarColumn(ColumnName = "BZ07")]
+ public string Bz07 { get; set; }
+
+ /// <summary>
+ /// 鍥剧墖3
+ ///</summary>
+ [SugarColumn(ColumnName = "BZ08")]
+ public string Bz08 { get; set; }
+
+ /// <summary>
+ /// 鍥剧墖4
+ ///</summary>
+ [SugarColumn(ColumnName = "BZ09")]
+ public string Bz09 { get; set; }
+
+ /// <summary>
+ /// 鍥剧墖5
+ ///</summary>
+ [SugarColumn(ColumnName = "BZ10")]
+ public string Bz10 { get; set; }
+
+ /// <summary>
+ /// QC鍒嗙粍ID
+ ///</summary>
+ [SugarColumn(ColumnName = "QC_TEAMID")]
+ public string QcTeamid { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡ID
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public decimal? ItemId { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? Type { get; set; }
+ }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/QsQaItemXj.cs b/MES.Service/Modes/QsQaItemXj.cs
index 8ee9853..77e2cc6 100644
--- a/MES.Service/Modes/QsQaItemXj.cs
+++ b/MES.Service/Modes/QsQaItemXj.cs
@@ -21,120 +21,117 @@
public decimal? Id { get; set; }
/// <summary>
- /// 宸ュ崟鍙�
- /// </summary>
- [Column("BILL_NO")]
- [SugarColumn(ColumnName = "BILL_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "宸ュ崟鍙烽暱搴︿笉鑳借秴鍑�50")]
- public string? BillNo { get; set; }
-
- /// <summary>
- /// 鍒涘缓浜�
- /// </summary>
- [Column("CREATE_BY")]
- [SugarColumn(ColumnName = "CREATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鍒涘缓浜洪暱搴︿笉鑳借秴鍑�100")]
- public string? CreateBy { get; set; }
-
- /// <summary>
- /// 鍒涘缓鏃ユ湡
- /// </summary>
- [Column("CREATE_DATE")]
- [SugarColumn(ColumnName = "CREATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? CreateDate { get; set; }
-
- /// <summary>
- /// 妫�楠屼汉鍛�
- /// </summary>
- [Column("FCHECK_BY")]
- [SugarColumn(ColumnName = "FCHECK_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屼汉鍛橀暱搴︿笉鑳借秴鍑�100")]
- public string? FcheckBy { get; set; }
-
- /// <summary>
- /// 妫�楠屾棩鏈�
- /// </summary>
- [Column("FCHECK_DATE")]
- [SugarColumn(ColumnName = "FCHECK_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? FcheckDate { get; set; }
-
- /// <summary>
- /// 妫�楠岀粨鏋�
- /// </summary>
- [Column("FCHECK_RESU")]
- [SugarColumn(ColumnName = "FCHECK_RESU")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠岀粨鏋滈暱搴︿笉鑳借秴鍑�100")]
- public string? FcheckResu { get; set; }
-
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [Column("ITEM_NO")]
- [SugarColumn(ColumnName = "ITEM_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鐗╂枡缂栫爜闀垮害涓嶈兘瓒呭嚭100")]
- public string? ItemNo { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [Column("ITEM_UNIT")]
- [SugarColumn(ColumnName = "ITEM_UNIT")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鍗曚綅闀垮害涓嶈兘瓒呭嚭100")]
- public string? ItemUnit { get; set; }
-
- /// <summary>
- /// 鏇存柊浜�
- /// </summary>
- [Column("LASTUPDATE_BY")]
- [SugarColumn(ColumnName = "LASTUPDATE_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "鏇存柊浜洪暱搴︿笉鑳借秴鍑�100")]
- public string? LastupdateBy { get; set; }
-
- /// <summary>
- /// 鏇存柊鏃ユ湡
- /// </summary>
- [Column("LASTUPDATE_DATE")]
- [SugarColumn(ColumnName = "LASTUPDATE_DATE")] //鐢ㄤ簬SqlSugar
- public DateTime? LastupdateDate { get; set; }
-
- /// <summary>
- /// </summary>
- [Column("MODIFY1_BY")]
- [SugarColumn(ColumnName = "MODIFY1_BY")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "Modify1By闀垮害涓嶈兘瓒呭嚭100")]
- public string? Modify1By { get; set; }
-
- /// <summary>
- /// 妫�楠屽崟鍙�
- /// </summary>
- [Column("RELEASE_NO")]
- [SugarColumn(ColumnName = "RELEASE_NO")] //鐢ㄤ簬SqlSugar
- [StringLength(100, ErrorMessage = "妫�楠屽崟鍙烽暱搴︿笉鑳借秴鍑�100")]
+ /// 妫�楠屽崟鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "RELEASE_NO")]
public string? ReleaseNo { get; set; }
/// <summary>
- /// 妯″叿鍙�
- /// </summary>
- [Column("MOID_NUM")]
- [SugarColumn(ColumnName = "MOID_NUM")] //鐢ㄤ簬SqlSugar
- [StringLength(50, ErrorMessage = "妯″叿鍙烽暱搴︿笉鑳借秴鍑�50")]
+ /// 妫�楠屾棩鏈�
+ ///</summary>
+ [SugarColumn(ColumnName = "FCHECK_DATE")]
+ public DateTime? FcheckDate { get; set; }
+
+ /// <summary>
+ /// 妫�楠屼汉鍛�
+ ///</summary>
+ [SugarColumn(ColumnName = "FCHECK_BY")]
+ public string? FcheckBy { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
+ public string? ItemNo { get; set; }
+
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ ///</summary>
+ [SugarColumn(ColumnName = "FCHECK_RESU")]
+ public string? FcheckResu { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
+ public string? CreateBy { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public DateTime? CreateDate { get; set; }
+
+ /// <summary>
+ /// 鏇存柊浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ public string? LastupdateBy { get; set; }
+
+ /// <summary>
+ /// 鏇存柊鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ public DateTime? LastupdateDate { get; set; }
+
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "MODIFY1_BY")]
+ public string? Modify1By { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_UNIT")]
+ public string? ItemUnit { get; set; }
+
+ /// <summary>
+ /// 宸ュ崟鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
+ public string? BillNo { get; set; }
+
+ /// <summary>
+ /// 妯″叿鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "MOID_NUM")]
public string? MoidNum { get; set; }
- [Column("Remarks")]
- [SugarColumn(ColumnName = "Remarks")] //鐢ㄤ簬SqlSugar
- [StringLength(200, ErrorMessage = "澶囨敞涓嶈兘瓒呭嚭200")]
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "FSUBMIT_BY")]
+ public string? FsubmitBy { get; set; }
+
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "FSUBMIT_DATE")]
+ public DateTime? FsubmitDate { get; set; }
+
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "FSUBMIT")]
+ public decimal? Fsubmit { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName = "REMARKS")]
public string? Remarks { get; set; }
- [SugarColumn(IsIgnore = true)] public decimal? CatQty { get; set; }
+ /// <summary>
+ /// 鐗╂枡ID
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public decimal? ItemId { get; set; }
[SugarColumn(IsIgnore = true)] public string? Daa020 { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? DetailMem { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? TaskNo { get; set; }
-
- [SugarColumn(IsIgnore = true)] public string? BoardModel { get; set; }
[SugarColumn(IsIgnore = true)] public decimal? PlanQty { get; set; }
- [SugarColumn(IsIgnore = true)] public string? Mocode { get; set; }
- [SugarColumn(IsIgnore = true)] public string? BoardStyle { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index 1fc62c1..9f0b7b9 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
index d303498..91b1dec 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index 868bcaf..748cc1c 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -145,7 +145,7 @@
Fissuetype = item.FIssueType,
Fisbatchmanage = item.FIsBatchManage,
Fpurchaserid = item.FPurchaserId,
- Fpurchaseunitid = Convert.ToDecimal(item.FPurchaseUnitId),
+ Fpurchaseunitid = item.FPurchaseUnitId,
Storeunit = item.FStoreUnitID,
Saleunit = item.FSaleUnitId,
Fforbidstatus = item.FForbidStatus,
@@ -153,6 +153,7 @@
ProductionWorkshop = item.FWorkShopId,
ProduceUnit = item.FPRODUCEUNITID,
SubconUnit = item.FSUBCONUNITID,
+ CreateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 3870859..01603a2 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -83,7 +83,8 @@
{
Id = a.Id,
Daa001 = a.Daa001,
- Daa003 = a.Daa003
+ Daa003 = a.Daa003,
+ Daa008 = a.Daa008
}).ToList();
}
@@ -98,8 +99,10 @@
.Select<MesItems>((a, b) =>
new MesItems
{
+ Id = b.Id,
ItemNo = b.ItemNo,
- ItemName = b.ItemName
+ ItemName = b.ItemName,
+ ItemModel = b.ItemModel,
}).ToList();
}
@@ -120,7 +123,7 @@
new JoinQueryInfos(
JoinType.Inner, s.BillNo == a.Daa001,
JoinType.Left, a.Daa015 == c.LineNo,
- JoinType.Left, s.ItemNo == b.ItemNo
+ JoinType.Left, s.ItemId == b.Id
)
)
.WhereIF(lineNo != null && lineNo.Length > 0,
@@ -136,15 +139,16 @@
.WhereIF(id > 0, (s, a, c, b) => s.Id == id)
.Select((s, a, c, b) => new QsQaItemXj
{
- MoidNum = s.MoidNum,
Daa020 = c.LineNo,
Id = s.Id,
+ PlanQty = a.Daa008,
CreateBy = s.CreateBy,
CreateDate = s.CreateDate,
ReleaseNo = s.ReleaseNo,
ItemNo = s.ItemNo,
- ItemUnit = s.ItemUnit,
BillNo = s.BillNo,
+ ItemName = b.ItemName,
+ ItemModel = b.ItemModel,
FcheckBy = s.FcheckBy,
FcheckResu = s.FcheckResu,
Remarks = s.Remarks
diff --git a/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs b/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
index f4a9f24..0aab9dd 100644
--- a/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
@@ -28,7 +28,7 @@
c.ItemNo == t.ItemNo && c.Company == t.Company &&
c.Factory == t.Factory,
JoinType.Left,
- t.Fpurchaseunitid == u.Id && t.Factory == u.Factory &&
+ t.Fpurchaseunitid == u.Id.ToString() && t.Factory == u.Factory &&
t.Company == u.Company
})
.Where((c, t, u) => c.Mid == query.id)
@@ -67,7 +67,7 @@
JoinType.Inner,
a.ItemNo == c.ItemNo && a.Company == c.Company &&
a.Factory == c.Factory,
- JoinType.Inner, c.Fpurchaseunitid == t.Id,
+ JoinType.Inner, c.Fpurchaseunitid == t.Id.ToString(),
JoinType.Inner, z.ReleaseNo == a.ReleaseNo
})
.Where((a, d, b, c, t, z) => a.FngHandle == "閫�璐�" &&
diff --git a/MES.Service/service/Warehouse/OrganizeService.cs b/MES.Service/service/Warehouse/OrganizeService.cs
index 817525d..1599197 100644
--- a/MES.Service/service/Warehouse/OrganizeService.cs
+++ b/MES.Service/service/Warehouse/OrganizeService.cs
@@ -109,7 +109,14 @@
return null;
}
- cBarcode2 = "9" + serial.Substring(1);
+ if (string.IsNullOrEmpty(serial))
+ {
+ cBarcode2 = "9";
+ }
+ else
+ {
+ cBarcode2 = "9" + serial[1..];
+ }
itemBarcode = query.ItemNo + cIndate + cBarcode2;
}
else
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index 1fc62c1..9f0b7b9 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
index d303498..91b1dec 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll
index 79ed70b..1a0c5d7 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.exe b/MESApplication/bin/Debug/net8.0/MESApplication.exe
index a4b110e..cfa4c24 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
index b457c4a..7aa1bc8 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
--
Gitblit v1.9.3