From 6f666ab6b8515ed988646ff1a9161f2f7eb6ee12 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 21 八月 2024 17:26:18 +0800
Subject: [PATCH] 更正
---
MES.Service/Dto/webApi/ErpDepartment.cs | 3
MES.Service/Dto/webApi/ErpCAB.cs | 12
MES.Service/Modes/MesRohInData.cs | 12
MES.Service/Dto/webApi/ErpDepots.cs | 5
MES.Service/Modes/MesInvItemBarcodes.cs | 829 ++++++++++++-------------
MES.Service/Modes/MesRohIn.cs | 6
MES.Service/service/Warehouse/MesInvItemOutsManager.cs | 58
MES.Service/Dto/webApi/ErpItemType.cs | 2
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MES.Service/Dto/webApi/ErpRohinData.cs | 22
MES.Service/Modes/MesStaff.cs | 11
MES.Service/service/BasicData/MesDepotsManager.cs | 9
MES.Service/Dto/webApi/ErpCustomer.cs | 7
MES.Service/Modes/MesItemType.cs | 11
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
MES.Service/Modes/SysDepartment.cs | 16
MES.Service/service/BasicData/MesPositionManager.cs | 5
MESApplication/bin/Debug/net8.0/MESApplication.xml | 36 -
MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs | 6
MES.Service/Modes/MesInvItemStocks.cs | 6
MES.Service/service/BasicData/SysDepartmentManager.cs | 8
MES.Service/Modes/Womcab.cs | 8
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/service/BasicData/MesItemsManager.cs | 14
MES.Service/Modes/Organize.cs | 73 +-
MES.Service/service/BasicData/MesStaffManager.cs | 11
MES.Service/service/BasicData/MesRohInManager.cs | 47
MES.Service/Dto/webApi/ErpRohIn.cs | 12
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MES.Service/service/Warehouse/MesInvItemMovesManager.cs | 2
MES.Service/service/WomcaaManager.cs | 33
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Modes/MesInvItemInCItems.cs | 18
MES.Service/Dto/webApi/ErpSupplier.cs | 5
MES.Service/Modes/MesPosition.cs | 26
MES.Service/service/BasicData/MesCustomerManager.cs | 8
MES.Service/service/BasicData/MesSupplierManager.cs | 9
MES.Service/Modes/MesSupplier.cs | 20
MES.Service/Modes/MesCustomer.cs | 20
MES.Service/service/Warehouse/OpeningReceiptServer.cs | 13
MES.Service/Dto/webApi/ErpPosition.cs | 3
MES.Service/Modes/MesDepots.cs | 40
MES.Service/service/BasicData/MesUnitManager.cs | 2
MES.Service/Dto/webApi/ErpItems.cs | 12
MES.Service/Dto/webApi/ErpCAA.cs | 15
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Modes/MesItems.cs | 25
MES.Service/Modes/MesQaItemsDetect01.cs | 24
MES.Service/Modes/MesInvBusiness2.cs | 6
MES.Service/Modes/MesInvItemArnDetail.cs | 12
/dev/null | 266 --------
MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs | 4
MES.Service/Dto/webApi/ErpStaff.cs | 4
MES.Service/Modes/MesInvItemInCDetails.cs | 90 +-
MES.Service/Modes/MesInvItemOutCDetails.cs | 6
MES.Service/Modes/Purdkb.cs | 6
MES.Service/service/BasicData/MesItemTypeManager.cs | 7
58 files changed, 693 insertions(+), 1,212 deletions(-)
diff --git a/MES.Service/Dto/webApi/ErpCAA.cs b/MES.Service/Dto/webApi/ErpCAA.cs
index 234bacc..523cdaf 100644
--- a/MES.Service/Dto/webApi/ErpCAA.cs
+++ b/MES.Service/Dto/webApi/ErpCAA.cs
@@ -4,8 +4,12 @@
{
public string Id { get; set; }
public string? Type { get; set; }
+
+ public string? FBILLTYPE { get; set; }
public string? FBillNo { get; set; }
- public string? FWorkShopID { get; set; }
+ public string? FWorkShopID0 { get; set; }
+ public string? FRoutingId { get; set; }
+ public string? FREMWorkShopId { get; set; }
public string? FStockId { get; set; }
public string? FDate { get; set; }
public string? FBillType { get; set; }
@@ -23,6 +27,7 @@
public string? FMTONO { get; set; }
public string? FLot { get; set; }
public string? FBomId { get; set; }
+ public string? F_UNW_Text_xsddh { get; set; }
public string? FCreateType { get; set; }
public string? FSrcBillType { get; set; }
public string? FSrcBillNo { get; set; }
@@ -32,9 +37,9 @@
public string? FForceCloserId { get; set; }
public string? FCloseType { get; set; }
public string? FSrcSplitBillNo { get; set; }
- public string? FDESCRIPTION { get; set; }
+ public string? FMemoItem { get; set; }
- public string? PLAN_ID { get; set; }
- public string? PLAN_SEQ { get; set; }
- public string? PLAN_NUM { get; set; }
+ public string? planId { get; set; }
+ public string? planSeq { get; set; }
+ public string? planNum { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpCAB.cs b/MES.Service/Dto/webApi/ErpCAB.cs
index 5be7747..70efe64 100644
--- a/MES.Service/Dto/webApi/ErpCAB.cs
+++ b/MES.Service/Dto/webApi/ErpCAB.cs
@@ -3,8 +3,8 @@
public class ErpCAB
{
public string? FBillNo { get; set; }
- public string? FMaterialID { get; set; }
- public string? FNeedQty { get; set; }
+ public string? FMaterialID2 { get; set; }
+ public string? FNeedQty2 { get; set; }
public string? FPickedQty { get; set; }
public string? FPositionNO { get; set; }
public string? FOwnerID { get; set; }
@@ -12,16 +12,16 @@
public string? FLot { get; set; }
public string? FStockID { get; set; }
public string? FIssueType { get; set; }
+ public string? F_UNW_Text_tpgy { get; set; }
public string? FUnitID { get; set; }
public string? FSupplyType { get; set; }
public string? FStdQty { get; set; }
public string? FIsKeyItem { get; set; }
public string? FNumerator { get; set; }
public string? FDenominator { get; set; }
- public string? FChildSupplyOrgId { get; set; }
- public string? FSUPPLYORG { get; set; }
- public string FENTRYID { get; set; }
- public string? FID { get; set; }
+ public string ID { get; set; }
+ public string? PID { get; set; }
+
public string? FSeq { get; set; }
public string? FFixScrapQty { get; set; }
diff --git a/MES.Service/Dto/webApi/ErpCustomer.cs b/MES.Service/Dto/webApi/ErpCustomer.cs
index d5ec8e7..46440a7 100644
--- a/MES.Service/Dto/webApi/ErpCustomer.cs
+++ b/MES.Service/Dto/webApi/ErpCustomer.cs
@@ -2,9 +2,6 @@
public class ErpCustomer
{
- //ERP鍌宠几閬庝締鐨勬暩鎿氬瓨鍎插湪閫欒！//json鏍煎紡灏忓
-
-
public string? Type { get; set; }
public string Id { get; set; }
public string? FNumber { get; set; }
@@ -14,8 +11,4 @@
public string? Fmobilephone { get; set; }
public string? Fseller { get; set; }
public string? FForbidStatus { get; set; }
-
- public string? Fumbrella { get; set; }
- public string? FSubsidiary { get; set; }
- public string? Fremarks { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpDepartment.cs b/MES.Service/Dto/webApi/ErpDepartment.cs
index 65101d2..e5fa314 100644
--- a/MES.Service/Dto/webApi/ErpDepartment.cs
+++ b/MES.Service/Dto/webApi/ErpDepartment.cs
@@ -17,7 +17,4 @@
public string? FForbidStatus { get; set; }
public string? Type { get; set; }
- public string? FParentID { get; set; }
- public string? Fumbrella { get; set; }
- public string? FSubsidiary { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpDepots.cs b/MES.Service/Dto/webApi/ErpDepots.cs
index f760253..8a88ef3 100644
--- a/MES.Service/Dto/webApi/ErpDepots.cs
+++ b/MES.Service/Dto/webApi/ErpDepots.cs
@@ -19,9 +19,4 @@
public string? FGroup { get; set; }
public string? Type { get; set; }
- public string? Fumbrella { get; set; }
- public string? FSubsidiary { get; set; }
- public string? FSUPPLIERID { get; set; }
- public string? Fdeptid { get; set; }
-
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpItemType.cs b/MES.Service/Dto/webApi/ErpItemType.cs
index b14ea74..ea4146c 100644
--- a/MES.Service/Dto/webApi/ErpItemType.cs
+++ b/MES.Service/Dto/webApi/ErpItemType.cs
@@ -8,6 +8,4 @@
public string? FNumber { get; set; }
public string? FName { get; set; }
public string? FDescription { get; set; }
- public string? Fumbrella { get; set; }
- public string? FSubsidiary { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpItems.cs b/MES.Service/Dto/webApi/ErpItems.cs
index 547ac41..e2b3a76 100644
--- a/MES.Service/Dto/webApi/ErpItems.cs
+++ b/MES.Service/Dto/webApi/ErpItems.cs
@@ -12,9 +12,7 @@
public double? FMaxStock { get; set; }
public double? FMinPackCount { get; set; }
public string? FStockId { get; set; }
- /// <summary>
- //public string? PPBOM00019124 { get; set; }
- /// </summary>
+ public string? PPBOM00019124 { get; set; }
public string? FMaterialGroup { get; set; }
public string? FDescription { get; set; }
public decimal? FFinishReceiptOverRate { get; set; }
@@ -30,12 +28,4 @@
public string? FPRODUCEUNITID { get; set; }
public string? FSUBCONUNITID { get; set; }
- public string? Fumbrella { get; set; }
- public string? FSubsidiary { get; set; }
- public string? FLOSSPERCENT { get; set; }
- public string? FMnemonicCode { get; set; }
- public string? FExpPeriod { get; set; }
-
-
-
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpOrganize.cs b/MES.Service/Dto/webApi/ErpOrganize.cs
deleted file mode 100644
index 27e47f5..0000000
--- a/MES.Service/Dto/webApi/ErpOrganize.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-锘縩amespace MES.Service.Dto.webApi;
-
-public class ErpOrganize
-{
- public string? Type { get; set; }
- public string Id { get; set; }
-
- public string? FNumber { get; set; }
- public string? FName { get; set; }
- public string? FForbidStatus { get; set; }
-
-}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpPosition.cs b/MES.Service/Dto/webApi/ErpPosition.cs
index 79deb8a..f3e812b 100644
--- a/MES.Service/Dto/webApi/ErpPosition.cs
+++ b/MES.Service/Dto/webApi/ErpPosition.cs
@@ -22,8 +22,7 @@
public string? FForbidderId { get; set; }
public string? FForbidDate { get; set; }
- public string? Fumbrella { get; set; }
- public string? FSubsidiary { get; set; }
+
/// <summary>
/// 绂佺敤鐘舵�� A 鍚敤 B绂佺敤
/// </summary>
diff --git a/MES.Service/Dto/webApi/ErpRohIn.cs b/MES.Service/Dto/webApi/ErpRohIn.cs
index 224befa..bbd2c6b 100644
--- a/MES.Service/Dto/webApi/ErpRohIn.cs
+++ b/MES.Service/Dto/webApi/ErpRohIn.cs
@@ -17,7 +17,7 @@
public string? Facctype { get; set; }
public string? FPurchaserId { get; set; }
- // public string? F_UNW_Remarks_zlyq { get; set; }
+ public string? F_UNW_Remarks_zlyq { get; set; }
// public string? F_UNW_GYSLXR { get; set; }
// public string? F_UNW_LXRDH { get; set; }
@@ -26,10 +26,10 @@
// public string? FProviderAddress { get; set; }
public string? FSettleId { get; set; }
public string? FChargeId { get; set; }
- // public string? FProviderEMail { get; set; }
- // public string? F_UNW_Text_ysfs { get; set; }
- public string? FHEADNOTE { get; set; }
- // public string? F_UNW_Combo_zjmj { get; set; }
+ public string? FProviderEMail { get; set; }
+ public string? F_UNW_Text_ysfs { get; set; }
+ public string? F_UNW_BZ { get; set; }
+ public string? F_UNW_Combo_zjmj { get; set; }
public string? FCancelStatus { get; set; }
public string? FCancellerId { get; set; }
public string? FCancelDate { get; set; }
@@ -43,5 +43,5 @@
public string? FCHANGEREASON { get; set; }
//閲囪喘璁㈠崟A 閲囪喘璁㈠崟鍙樻洿鍗旴
- //public string? FBILLTYPE { get; set; }
+ public string? FBILLTYPE { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpRohinData.cs b/MES.Service/Dto/webApi/ErpRohinData.cs
index 8d3684a..70cd6a6 100644
--- a/MES.Service/Dto/webApi/ErpRohinData.cs
+++ b/MES.Service/Dto/webApi/ErpRohinData.cs
@@ -5,22 +5,20 @@
public string id { get; set; }
public string Eid { get; set; }
public string? FBillNo { get; set; }
- public string? FDEMANDBILLNO { get; set; }
- public string? FSEQ { get; set; }
+ public string? F_UNW_Text_xsddh { get; set; }
public string? FMaterialId { get; set; }
+ public string? FMaterialName { get; set; }
+ public string? FModel { get; set; }
public string? FUnitId { get; set; }
public string? FQty { get; set; }
public string? FStockUnitID { get; set; }
+ public string? FPriceUnitId { get; set; }
+ public string? FPriceUnitQty { get; set; }
public string? FDeliveryDate { get; set; }
public string? FDeliveryEarlyDate { get; set; }
public string? FDeliveryLastDate { get; set; }
- public string? FRequireOrgId { get; set; }
- public string? FRequireDeptId { get; set; }
- public string? FReceiveOrgId { get; set; }
- public string? FReceiveDeptId { get; set; }
- public string? FSETTLEORGID { get; set; }
public string? FGiveAway { get; set; }
- public string? Fnote { get; set; }
+ public string? FEntryNote { get; set; }
public string? FSupMatId { get; set; }
public string? FSupMatName { get; set; }
public string? FSUBREQBILLNO { get; set; }
@@ -45,8 +43,10 @@
public string? FMtoNo { get; set; }
public string? FChangeFlag { get; set; }
public string? FDEMANDTYPE { get; set; }
- //public string? FDEMANDBILLNO { get; set; }
+ public string? FDEMANDBILLNO { get; set; }
public string? FDEMANDBILLENTRYSEQ { get; set; }
- public string? fentryid { get; set; }
-
+ public string? PurchaseOrderLineNumber { get; set; }
+ public string? Demand { get; set; }
+ public string? Receiving { get; set; }
+ public string? Settlement { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpStaff.cs b/MES.Service/Dto/webApi/ErpStaff.cs
index b7a58e4..263ad9a 100644
--- a/MES.Service/Dto/webApi/ErpStaff.cs
+++ b/MES.Service/Dto/webApi/ErpStaff.cs
@@ -12,8 +12,4 @@
public string? FStaffStartDate { get; set; }
public string? FDescription { get; set; }
public string? FForbidStatus { get; set; }
-
- public string? Fumbrella { get; set; }
- public string? FSubsidiary { get; set; }
-
}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpSupplier.cs b/MES.Service/Dto/webApi/ErpSupplier.cs
index a135141..7187428 100644
--- a/MES.Service/Dto/webApi/ErpSupplier.cs
+++ b/MES.Service/Dto/webApi/ErpSupplier.cs
@@ -11,9 +11,4 @@
public string? F_UNW_LXRDH { get; set; }
public string? FStaffId { get; set; }
public string? FForbidStatus { get; set; }
-
- public string? Fumbrella { get; set; }
- public string? Fsubsidiary { get; set; }
- public string? Fremarks { get; set; }
-
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesCustomer.cs b/MES.Service/Modes/MesCustomer.cs
index 8752b6b..40948f7 100644
--- a/MES.Service/Modes/MesCustomer.cs
+++ b/MES.Service/Modes/MesCustomer.cs
@@ -141,22 +141,18 @@
public string? Fseller { get; set; }
/// <summary>
- /// 鍌欒ɑ
+ /// 鑷畾涔夊瓧娈�1
/// </summary>
- [SugarColumn(ColumnName = "fremarks")]
- public string? fremarks { get; set; }
+ [SugarColumn(ColumnName = "REMARK1")]
+ public string? Remark1 { get; set; }
/// <summary>
- /// 浣跨敤绲勭箶
+ /// 鑷畾涔夊瓧娈�2
/// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
+ [SugarColumn(ColumnName = "REMARK2")]
+ public string? Remark2 { get; set; }
+
/// <summary>
- /// 鍓靛缓绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
- /* /// <summary>
/// 鑷畾涔夊瓧娈�3
/// </summary>
[SugarColumn(ColumnName = "REMARK3")]
@@ -173,6 +169,6 @@
/// </summary>
[SugarColumn(ColumnName = "REMARK5")]
public string? Remark5 { get; set; }
-*/
+
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesDepots.cs b/MES.Service/Modes/MesDepots.cs
index 69e2e55..27537b2 100644
--- a/MES.Service/Modes/MesDepots.cs
+++ b/MES.Service/Modes/MesDepots.cs
@@ -147,22 +147,34 @@
public string? MaterialProperti { get; set; }
/// <summary>
- /// 浣跨敤绲勭箶
+ /// 鑷畾涔夊瓧娈�1
/// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
- /// <summary>
- /// 鍓靛缓绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
+ [SugarColumn(ColumnName = "REMARK1")]
+ public string? Remark1 { get; set; }
- [SugarColumn(ColumnName = "FSTOCKSTATUSTYPE")]
- public string? FStockStatusType { get; set; }
- [SugarColumn(ColumnName = "FSUPPLIERID")]
- public string? FSUPPLIERID { get; set; }
- [SugarColumn(ColumnName = "Fdeptid")]
- public string? Fdeptid { 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>
+ /// 鑷畾涔夊瓧娈�4
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK4")]
+ public string? Remark4 { get; set; }
+
+ /// <summary>
+ /// 鑷畾涔夊瓧娈�5
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK5")]
+ public string? Remark5 { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvBusiness2.cs b/MES.Service/Modes/MesInvBusiness2.cs
index b366245..89ddce5 100644
--- a/MES.Service/Modes/MesInvBusiness2.cs
+++ b/MES.Service/Modes/MesInvBusiness2.cs
@@ -224,10 +224,4 @@
/// </summary>
[SugarColumn(ColumnName = "LINE_K3ID")]
public decimal? LineK3id { get; set; }
-
- /// <summary>
- /// 鐗╂枡id
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_ID")]
- public decimal? ItemId { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemArnDetail.cs b/MES.Service/Modes/MesInvItemArnDetail.cs
index 83622a8..7be265c 100644
--- a/MES.Service/Modes/MesInvItemArnDetail.cs
+++ b/MES.Service/Modes/MesInvItemArnDetail.cs
@@ -217,18 +217,6 @@
[SugarColumn(ColumnName = "CBILL_NO")]
public string CbillNo { get; set; }
- /// <summary>
- /// 閲囪喘鍏ュ簱鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CG_RKQTY")]
- public decimal? CgRkqty { get; set; }
-
- /// <summary>
- /// 鐗╂枡id
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_ID")]
- public decimal? ItemId { get; set; }
-
[SugarColumn(IsIgnore = true)] public string? itemModel { get; set; }
[SugarColumn(IsIgnore = true)] public string? itemName { get; set; }
diff --git a/MES.Service/Modes/MesInvItemBarcodes.cs b/MES.Service/Modes/MesInvItemBarcodes.cs
index ac5878a..11af555 100644
--- a/MES.Service/Modes/MesInvItemBarcodes.cs
+++ b/MES.Service/Modes/MesInvItemBarcodes.cs
@@ -1,500 +1,497 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
+锘縰sing SqlSugar;
-namespace MES.Service.Modes
+namespace MES.Service.Modes;
+
+/// <summary>
+/// 鐗╂枡鏉＄爜琛�
+/// </summary>
+[SugarTable("MES_INV_ITEM_BARCODES")]
+public class MesInvItemBarcodes
{
/// <summary>
- /// 鐗╂枡鏉＄爜琛�
+ /// SEQ_BARCODE_PSN_ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_EQBASE",
+ IsPrimaryKey = true)]
+ public decimal Id { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鏉＄爜
///</summary>
- [SugarTable("MES_INV_ITEM_BARCODES")]
- public class MesInvItemBarcodes
- {
- /// <summary>
- /// SEQ_BARCODE_PSN_ID
- ///</summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
- public decimal Id { get; set; }
+ [SugarColumn(ColumnName = "ITEM_BARCODE")]
+ public string ItemBarcode { get; set; }
- /// <summary>
- /// 鐗╂枡鏉＄爜
- ///</summary>
- [SugarColumn(ColumnName = "ITEM_BARCODE")]
- public string ItemBarcode { get; set; }
+ /// <summary>
+ /// 瀹㈡埛鎴愬搧缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "C_PRODUCT_CODE")]
+ public string CProductCode { get; set; }
- /// <summary>
- /// 瀹㈡埛鎴愬搧缂栫爜
- ///</summary>
- [SugarColumn(ColumnName = "C_PRODUCT_CODE")]
- public string CProductCode { get; set; }
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡鏉＄爜
+ ///</summary>
+ [SugarColumn(ColumnName = "C_ITEM_BARCODE")]
+ public string CItemBarcode { get; set; }
- /// <summary>
- /// 瀹㈡埛鐗╂枡鏉＄爜
- ///</summary>
- [SugarColumn(ColumnName = "C_ITEM_BARCODE")]
- public string CItemBarcode { get; set; }
+ /// <summary>
+ /// 瀹㈡埛鐗╂枡缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "C_ITEM_CODE")]
+ public string CItemCode { get; set; }
- /// <summary>
- /// 瀹㈡埛鐗╂枡缂栫爜
- ///</summary>
- [SugarColumn(ColumnName = "C_ITEM_CODE")]
- public string CItemCode { get; set; }
+ /// <summary>
+ /// 鏈徃鐗╂枡缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
+ public string ItemNo { get; set; }
- /// <summary>
- /// 鏈徃鐗╂枡缂栫爜
- ///</summary>
- [SugarColumn(ColumnName = "ITEM_NO")]
- public string ItemNo { get; set; }
+ /// <summary>
+ /// 鍘傚鎵规
+ ///</summary>
+ [SugarColumn(ColumnName = "LOT_NO")]
+ public string LotNo { get; set; }
- /// <summary>
- /// 鍘傚鎵规
- ///</summary>
- [SugarColumn(ColumnName = "LOT_NO")]
- public string LotNo { get; set; }
+ /// <summary>
+ /// 鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "QUANTITY")]
+ public decimal? Quantity { get; set; }
- /// <summary>
- /// 鏁伴噺
- ///</summary>
- [SugarColumn(ColumnName = "QUANTITY")]
- public decimal? Quantity { get; set; }
+ /// <summary>
+ /// 鏄惁鐜繚(0:鍚�,1:鏄�)
+ ///</summary>
+ [SugarColumn(ColumnName = "EP_FLAG")]
+ public short? EpFlag { get; set; }
- /// <summary>
- /// 鏄惁鐜繚(0:鍚�,1:鏄�)
- ///</summary>
- [SugarColumn(ColumnName = "EP_FLAG")]
- public short? EpFlag { get; set; }
+ /// <summary>
+ /// 鐢熶骇宸ュ崟
+ ///</summary>
+ [SugarColumn(ColumnName = "TASK_NO")]
+ public string TaskNo { get; set; }
- /// <summary>
- /// 鐢熶骇宸ュ崟
- ///</summary>
- [SugarColumn(ColumnName = "TASK_NO")]
- public string TaskNo { 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 = "CUST_NO")]
+ public string CustNo { get; set; }
- /// <summary>
- /// 瀹㈡埛缂栧彿
- ///</summary>
- [SugarColumn(ColumnName = "CUST_NO")]
- public string CustNo { get; set; }
+ /// <summary>
+ /// 鐗╂枡鏉＄爜娉ㄩ噴琛孾鍐椾綑锛屾潯鐮侀噸鎵撲娇鐢╙
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_BARCODE_TEXT")]
+ public string ItemBarcodeText { get; set; }
- /// <summary>
- /// 鐗╂枡鏉＄爜娉ㄩ噴琛孾鍐椾綑锛屾潯鐮侀噸鎵撲娇鐢╙
- ///</summary>
- [SugarColumn(ColumnName = "ITEM_BARCODE_TEXT")]
- public string ItemBarcodeText { get; set; }
+ /// <summary>
+ /// 鍘烶SN鐗╂枡鏉＄爜
+ ///</summary>
+ [SugarColumn(ColumnName = "OLD_ITEM_BARCODE")]
+ public string OldItemBarcode { get; set; }
- /// <summary>
- /// 鍘烶SN鐗╂枡鏉＄爜
- ///</summary>
- [SugarColumn(ColumnName = "OLD_ITEM_BARCODE")]
- public string OldItemBarcode { get; set; }
+ /// <summary>
+ /// SAP鏀惰揣鐗╂枡鍑瘉鍙� --閲囪喘鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName = "MBLNR")]
+ public string Mblnr { get; set; }
- /// <summary>
- /// SAP鏀惰揣鐗╂枡鍑瘉鍙� --閲囪喘鍗曞彿
- ///</summary>
- [SugarColumn(ColumnName = "MBLNR")]
- public string Mblnr { get; set; }
+ /// <summary>
+ /// SAP鏀惰揣鐗╂枡鍑瘉琛屽彿 --閲囪喘鍗曡鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "ZEILE")]
+ public decimal? Zeile { get; set; }
- /// <summary>
- /// SAP鏀惰揣鐗╂枡鍑瘉琛屽彿 --閲囪喘鍗曡鍙�
- ///</summary>
- [SugarColumn(ColumnName = "ZEILE")]
- public decimal? Zeile { get; set; }
+ /// <summary>
+ /// 鏀舵枡琛↖D
+ ///</summary>
+ [SugarColumn(ColumnName = "ROH_IN_ID")]
+ public decimal? RohInId { get; set; }
- /// <summary>
- /// 鏀舵枡琛↖D
- ///</summary>
- [SugarColumn(ColumnName = "ROH_IN_ID")]
- public decimal? RohInId { get; set; }
+ /// <summary>
+ /// 0涓烘湁鏁堟潯鐮侊紱1涓烘棤鏁堟潯鐮�
+ ///</summary>
+ [SugarColumn(ColumnName = "BARCODESTATUS")]
+ public short? Barcodestatus { get; set; }
- /// <summary>
- /// 0涓烘湁鏁堟潯鐮侊紱1涓烘棤鏁堟潯鐮�
- ///</summary>
- [SugarColumn(ColumnName = "BARCODESTATUS")]
- public short? Barcodestatus { get; set; }
+ /// <summary>
+ /// 鍘熷鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "OLDQTY")]
+ public decimal? Oldqty { get; set; }
- /// <summary>
- /// 鍘熷鏁伴噺
- ///</summary>
- [SugarColumn(ColumnName = "OLDQTY")]
- public decimal? Oldqty { get; set; }
+ /// <summary>
+ /// 浣跨敤鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "USEQTY")]
+ public decimal? Useqty { get; set; }
- /// <summary>
- /// 浣跨敤鏁伴噺
- ///</summary>
- [SugarColumn(ColumnName = "USEQTY")]
- public decimal? Useqty { get; set; }
+ /// <summary>
+ /// 0鍦ㄥ簱锛�1鍦ㄧ嚎锛�2浣滃簾
+ ///</summary>
+ [SugarColumn(ColumnName = "LOCATION")]
+ public short? Location { get; set; }
- /// <summary>
- /// 0鍦ㄥ簱锛�1鍦ㄧ嚎锛�2浣滃簾
- ///</summary>
- [SugarColumn(ColumnName = "LOCATION")]
- public short? Location { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName = "UNIT")]
+ public string Unit { get; set; }
- /// <summary>
- /// 鍗曚綅
- ///</summary>
- [SugarColumn(ColumnName = "UNIT")]
- public string Unit { get; set; }
+ /// <summary>
+ /// 閲嶉噺锛堝崟浣嶏細鍏枻锛�
+ ///</summary>
+ [SugarColumn(ColumnName = "WEIGHT_UNIT")]
+ public decimal? WeightUnit { get; set; }
- /// <summary>
- /// 閲嶉噺锛堝崟浣嶏細鍏枻锛�
- ///</summary>
- [SugarColumn(ColumnName = "WEIGHT_UNIT")]
- public decimal? WeightUnit { get; set; }
+ /// <summary>
+ /// 鍗曚环
+ ///</summary>
+ [SugarColumn(ColumnName = "PRICE")]
+ public decimal? Price { get; set; }
- /// <summary>
- /// 鍗曚环
- ///</summary>
- [SugarColumn(ColumnName = "PRICE")]
- public decimal? Price { get; set; }
+ /// <summary>
+ /// 鍘熸潯鐮佹暟閲�
+ ///</summary>
+ [SugarColumn(ColumnName = "OLD_BAR_QUANTITY")]
+ public decimal? OldBarQuantity { get; set; }
- /// <summary>
- /// 鍘熸潯鐮佹暟閲�
- ///</summary>
- [SugarColumn(ColumnName = "OLD_BAR_QUANTITY")]
- public decimal? OldBarQuantity { get; set; }
+ /// <summary>
+ /// 姹囨�绘潯鐮�
+ ///</summary>
+ [SugarColumn(ColumnName = "SUM_BARCODE")]
+ public string SumBarcode { get; set; }
- /// <summary>
- /// 姹囨�绘潯鐮�
- ///</summary>
- [SugarColumn(ColumnName = "SUM_BARCODE")]
- public string SumBarcode { get; set; }
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "LOT_DATE")]
+ public string LotDate { get; set; }
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- ///</summary>
- [SugarColumn(ColumnName = "LOT_DATE")]
- public string LotDate { get; set; }
+ /// <summary>
+ /// 妯″彿
+ ///</summary>
+ [SugarColumn(ColumnName = "MOCODE")]
+ public string Mocode { get; set; }
- /// <summary>
- /// 妯″彿
- ///</summary>
- [SugarColumn(ColumnName = "MOCODE")]
- public string Mocode { get; set; }
+ /// <summary>
+ /// 鏉ユ簮
+ ///</summary>
+ [SugarColumn(ColumnName = "MEMO")]
+ public string Memo { get; set; }
- /// <summary>
- /// 鏉ユ簮
- ///</summary>
- [SugarColumn(ColumnName = "MEMO")]
- public string Memo { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鐮�
+ ///</summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
+ public string SuppNo { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗙紪鐮�
- ///</summary>
- [SugarColumn(ColumnName = "SUPP_NO")]
- public string SuppNo { get; set; }
+ /// <summary>
+ /// 妗ｄ綅浣庡��
+ ///</summary>
+ [SugarColumn(ColumnName = "SPOSTION")]
+ public string Spostion { get; set; }
- /// <summary>
- /// 妗ｄ綅浣庡��
- ///</summary>
- [SugarColumn(ColumnName = "SPOSTION")]
- public string Spostion { get; set; }
+ /// <summary>
+ /// 妗ｄ綅楂樺��
+ ///</summary>
+ [SugarColumn(ColumnName = "EPOSTION")]
+ public string Epostion { get; set; }
- /// <summary>
- /// 妗ｄ綅楂樺��
- ///</summary>
- [SugarColumn(ColumnName = "EPOSTION")]
- public string Epostion { 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>
+ /// 鏄惁宸插喕缁�,1鍐荤粨
+ ///</summary>
+ [SugarColumn(ColumnName = "VISABLE")]
+ public short? Visable { get; set; }
- /// <summary>
- /// 鏄惁宸插喕缁�,1鍐荤粨
- ///</summary>
- [SugarColumn(ColumnName = "VISABLE")]
- public short? Visable { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗘壒娆�
+ ///</summary>
+ [SugarColumn(ColumnName = "TR_LOTNO")]
+ public string TrLotno { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗘壒娆�
- ///</summary>
- [SugarColumn(ColumnName = "TR_LOTNO")]
- public string TrLotno { get; set; }
+ /// <summary>
+ /// 鍐荤粨鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "FLEZZ_DATE")]
+ public DateTime? FlezzDate { get; set; }
- /// <summary>
- /// 鍐荤粨鏃堕棿
- ///</summary>
- [SugarColumn(ColumnName = "FLEZZ_DATE")]
- public DateTime? FlezzDate { get; set; }
+ /// <summary>
+ /// 鍐荤粨鍘熷洜
+ ///</summary>
+ [SugarColumn(ColumnName = "FLEZZ_REASON")]
+ public string FlezzReason { get; set; }
- /// <summary>
- /// 鍐荤粨鍘熷洜
- ///</summary>
- [SugarColumn(ColumnName = "FLEZZ_REASON")]
- public string FlezzReason { get; set; }
+ /// <summary>
+ /// 鍐荤粨浜�
+ ///</summary>
+ [SugarColumn(ColumnName = "FLEZZ_BY")]
+ public string FlezzBy { get; set; }
- /// <summary>
- /// 鍐荤粨浜�
- ///</summary>
- [SugarColumn(ColumnName = "FLEZZ_BY")]
- public string FlezzBy { get; set; }
-
- /// <summary>
- /// 寤堕暱淇濊川鏈�
- ///</summary>
- [SugarColumn(ColumnName = "DELANY_MONTH")]
- public decimal? DelanyMonth { get; set; }
+ /// <summary>
+ /// 寤堕暱淇濊川鏈�
+ ///</summary>
+ [SugarColumn(ColumnName = "DELANY_MONTH")]
+ public decimal? DelanyMonth { get; set; }
- /// <summary>
- /// 鏈�灏忓寘瑁呮爣璇�
- ///</summary>
- [SugarColumn(ColumnName = "MINPACK_FLAG")]
- public short? MinpackFlag { get; set; }
+ /// <summary>
+ /// 鏈�灏忓寘瑁呮爣璇�
+ ///</summary>
+ [SugarColumn(ColumnName = "MINPACK_FLAG")]
+ public short? MinpackFlag { get; set; }
- /// <summary>
- /// 鎵撳嵃ID锛岀敤鏉ュ尯鍒嗘墦鍗版鏁�
- ///</summary>
- [SugarColumn(ColumnName = "PRINT_ID")]
- public string PrintId { get; set; }
+ /// <summary>
+ /// 鎵撳嵃ID锛岀敤鏉ュ尯鍒嗘墦鍗版鏁�
+ ///</summary>
+ [SugarColumn(ColumnName = "PRINT_ID")]
+ public string PrintId { get; set; }
- /// <summary>
- /// 鐜繚椤圭洰
- ///</summary>
- [SugarColumn(ColumnName = "EP_ITEM")]
- public string EpItem { get; set; }
+ /// <summary>
+ /// 鐜繚椤圭洰
+ ///</summary>
+ [SugarColumn(ColumnName = "EP_ITEM")]
+ public string EpItem { 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>
- /// 鍗℃澘缂栫爜
- ///</summary>
- [SugarColumn(ColumnName = "CB_NO")]
- public string CbNo { get; set; }
+ /// <summary>
+ /// 鍗℃澘缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName = "CB_NO")]
+ public string CbNo { get; set; }
- /// <summary>
- /// 鍘傚鐢熶骇绾�
- ///</summary>
- [SugarColumn(ColumnName = "LINFLINE")]
- public string Linfline { get; set; }
+ /// <summary>
+ /// 鍘傚鐢熶骇绾�
+ ///</summary>
+ [SugarColumn(ColumnName = "LINFLINE")]
+ public string Linfline { get; set; }
- /// <summary>
- /// 鏈夋晥鏈�
- ///</summary>
- [SugarColumn(ColumnName = "VALID_TIME")]
- public DateTime? ValidTime { get; set; }
+ /// <summary>
+ /// 鏈夋晥鏈�
+ ///</summary>
+ [SugarColumn(ColumnName = "VALID_TIME")]
+ public DateTime? ValidTime { get; set; }
- /// <summary>
- /// 璐ㄦ缁撴灉
- ///</summary>
- [SugarColumn(ColumnName = "IQC_STATUS")]
- public string IqcStatus { get; set; }
+ /// <summary>
+ /// 璐ㄦ缁撴灉
+ ///</summary>
+ [SugarColumn(ColumnName = "IQC_STATUS")]
+ public string IqcStatus { get; set; }
- /// <summary>
- /// 灏忚溅鏉＄爜
- ///</summary>
- [SugarColumn(ColumnName = "FCAR")]
- public string Fcar { get; set; }
+ /// <summary>
+ /// 灏忚溅鏉＄爜
+ ///</summary>
+ [SugarColumn(ColumnName = "FCAR")]
+ public string Fcar { get; set; }
- /// <summary>
- /// 姣涢噸
- ///</summary>
- [SugarColumn(ColumnName = "GWEIGHT")]
- public string Gweight { get; set; }
+ /// <summary>
+ /// 姣涢噸
+ ///</summary>
+ [SugarColumn(ColumnName = "GWEIGHT")]
+ public string Gweight { get; set; }
- /// <summary>
- /// 鍑�閲�
- ///</summary>
- [SugarColumn(ColumnName = "NWEIGHT")]
- public string Nweight { get; set; }
+ /// <summary>
+ /// 鍑�閲�
+ ///</summary>
+ [SugarColumn(ColumnName = "NWEIGHT")]
+ public string Nweight { get; set; }
- /// <summary>
- /// 淇濊川鏈�
- ///</summary>
- [SugarColumn(ColumnName = "EXT_DATE")]
- public decimal? ExtDate { get; set; }
+ /// <summary>
+ /// 淇濊川鏈�
+ ///</summary>
+ [SugarColumn(ColumnName = "EXT_DATE")]
+ public decimal? ExtDate { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗐�佽禒鍝併�佸渚涙枡銆佸澶�
- ///</summary>
- [SugarColumn(ColumnName = "BARCODETYPE")]
- public string Barcodetype { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗐�佽禒鍝併�佸渚涙枡銆佸澶�
+ ///</summary>
+ [SugarColumn(ColumnName = "BARCODETYPE")]
+ public string Barcodetype { get; set; }
- /// <summary>
- /// 渚涘簲鍟嗗悕绉�
- ///</summary>
- [SugarColumn(ColumnName = "SUPP_NAME")]
- public string SuppName { get; set; }
+ /// <summary>
+ /// 渚涘簲鍟嗗悕绉�
+ ///</summary>
+ [SugarColumn(ColumnName = "SUPP_NAME")]
+ public string SuppName { get; set; }
- /// <summary>
- /// 鍒拌揣鍗曞彿/鍏ュ簱鍗曞彿
- ///</summary>
- [SugarColumn(ColumnName = "BILL_NO")]
- public string BillNo { get; set; }
+ /// <summary>
+ /// 鍒拌揣鍗曞彿/鍏ュ簱鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
+ public string BillNo { get; set; }
- /// <summary>
- /// 鎬ユ枡鏍囪瘑
- ///</summary>
- [SugarColumn(ColumnName = "URGENT_FLAG")]
- public short? UrgentFlag { get; set; }
+ /// <summary>
+ /// 鎬ユ枡鏍囪瘑
+ ///</summary>
+ [SugarColumn(ColumnName = "URGENT_FLAG")]
+ public short? UrgentFlag { get; set; }
- /// <summary>
- /// 棰滆壊
- ///</summary>
- [SugarColumn(ColumnName = "COLOR_NAME")]
- public string ColorName { get; set; }
+ /// <summary>
+ /// 棰滆壊
+ ///</summary>
+ [SugarColumn(ColumnName = "COLOR_NAME")]
+ public string ColorName { get; set; }
- /// <summary>
- /// 浜у搧鍨嬪彿
- ///</summary>
- [SugarColumn(ColumnName = "BOARD_STYLE")]
- public string BoardStyle { get; set; }
+ /// <summary>
+ /// 浜у搧鍨嬪彿
+ ///</summary>
+ [SugarColumn(ColumnName = "BOARD_STYLE")]
+ public string BoardStyle { get; set; }
- /// <summary>
- /// 鏉ユ枡鏃ユ湡
- ///</summary>
- [SugarColumn(ColumnName = "INS_DATE")]
- public DateTime? InsDate { get; set; }
+ /// <summary>
+ /// 鏉ユ枡鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName = "INS_DATE")]
+ public DateTime? InsDate { get; set; }
- /// <summary>
- /// 鍒拌揣鍗曡鍙�
- ///</summary>
- [SugarColumn(ColumnName = "WORK_LINE")]
- public decimal? WorkLine { get; set; }
+ /// <summary>
+ /// 鍒拌揣鍗曡鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "WORK_LINE")]
+ public decimal? WorkLine { get; set; }
- /// <summary>
- /// 涓嶈壇鍘熷洜
- ///</summary>
- [SugarColumn(ColumnName = "MEMO_BAD")]
- public string MemoBad { get; set; }
+ /// <summary>
+ /// 涓嶈壇鍘熷洜
+ ///</summary>
+ [SugarColumn(ColumnName = "MEMO_BAD")]
+ public string MemoBad { get; set; }
- /// <summary>
- /// 浠诲姟鍗曞彿
- ///</summary>
- [SugarColumn(ColumnName = "WORK_NO")]
- public string WorkNo { get; set; }
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName = "WORK_NO")]
+ public string WorkNo { get; set; }
- /// <summary>
- /// 鏉＄爜鏉ユ簮鏍囪瘑锛�0-鍒濇湡鐗╂枡,1-閲囪喘鍏ュ簱锛�2銆佺敓浜ч��鏂欙紝3銆佸叾瀹冨叆搴擄紝4-瀹緵鏂�,5-鍦ㄥ簱鍒嗘枡锛�6-鍒剁▼鏉＄爜
- ///</summary>
- [SugarColumn(ColumnName = "COME_FLG")]
- public short? ComeFlg { get; set; }
+ /// <summary>
+ /// 鏉＄爜鏉ユ簮鏍囪瘑锛�0-鍒濇湡鐗╂枡,1-閲囪喘鍏ュ簱锛�2銆佺敓浜ч��鏂欙紝3銆佸叾瀹冨叆搴擄紝4-瀹緵鏂�,5-鍦ㄥ簱鍒嗘枡锛�6-鍒剁▼鏉＄爜
+ ///</summary>
+ [SugarColumn(ColumnName = "COME_FLG")]
+ public short? ComeFlg { get; set; }
- /// <summary>
- /// 鐢熶骇绾夸綋
- ///</summary>
- [SugarColumn(ColumnName = "LINE_NO")]
- public string LineNo { get; set; }
+ /// <summary>
+ /// 鐢熶骇绾夸綋
+ ///</summary>
+ [SugarColumn(ColumnName = "LINE_NO")]
+ public string LineNo { get; set; }
- /// <summary>
- /// 涓濆嵃娆℃暟
- ///</summary>
- [SugarColumn(ColumnName = "SILK_PQTY")]
- public decimal? SilkPqty { get; set; }
+ /// <summary>
+ /// 涓濆嵃娆℃暟
+ ///</summary>
+ [SugarColumn(ColumnName = "SILK_PQTY")]
+ public decimal? SilkPqty { get; set; }
- /// <summary>
- /// 涓濆嵃娆℃暟姣�
- ///</summary>
- [SugarColumn(ColumnName = "SILK")]
- public string Silk { get; set; }
+ /// <summary>
+ /// 涓濆嵃娆℃暟姣�
+ ///</summary>
+ [SugarColumn(ColumnName = "SILK")]
+ public string Silk { get; set; }
- /// <summary>
- /// 涓濆嵃娲惧伐浠庤〃ID
- ///</summary>
- [SugarColumn(ColumnName = "SILK_ID")]
- public decimal? SilkId { get; set; }
+ /// <summary>
+ /// 涓濆嵃娲惧伐浠庤〃ID
+ ///</summary>
+ [SugarColumn(ColumnName = "SILK_ID")]
+ public decimal? SilkId { get; set; }
- /// <summary>
- /// 宸叉姤宸ユ爣璇�
- ///</summary>
- [SugarColumn(ColumnName = "WORK_FLG")]
- public decimal? WorkFlg { get; set; }
+ /// <summary>
+ /// 宸叉姤宸ユ爣璇�
+ ///</summary>
+ [SugarColumn(ColumnName = "WORK_FLG")]
+ public decimal? WorkFlg { get; set; }
- /// <summary>
- /// 鏈�鍚庡伐搴�
- ///</summary>
- [SugarColumn(ColumnName = "WORK_LAST")]
- public decimal? WorkLast { get; set; }
+ /// <summary>
+ /// 鏈�鍚庡伐搴�
+ ///</summary>
+ [SugarColumn(ColumnName = "WORK_LAST")]
+ public decimal? WorkLast { get; set; }
- /// <summary>
- /// 0-鏈悎骞舵墦鍗帮紝1-鍚堝苟鎵撳嵃
- ///</summary>
- [SugarColumn(ColumnName = "HBDY")]
- public decimal? Hbdy { get; set; }
+ /// <summary>
+ /// 0-鏈悎骞舵墦鍗帮紝1-鍚堝苟鎵撳嵃
+ ///</summary>
+ [SugarColumn(ColumnName = "HBDY")]
+ public decimal? Hbdy { get; set; }
- /// <summary>
- /// 0-鏈夋晥鏉＄爜锛�1-鍚堝苟鎷嗗垎鐨勬潯鐮侊紝鏃犳晥
- ///</summary>
- [SugarColumn(ColumnName = "HBDYTM")]
- public decimal? Hbdytm { get; set; }
+ /// <summary>
+ /// 0-鏈夋晥鏉＄爜锛�1-鍚堝苟鎷嗗垎鐨勬潯鐮侊紝鏃犳晥
+ ///</summary>
+ [SugarColumn(ColumnName = "HBDYTM")]
+ public decimal? Hbdytm { get; set; }
- /// <summary>
- /// 鎶ュ伐鏃堕棿
- ///</summary>
- [SugarColumn(ColumnName = "WORK_FLGTIME")]
- public string WorkFlgtime { get; set; }
+ /// <summary>
+ /// 鎶ュ伐鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "WORK_FLGTIME")]
+ public string WorkFlgtime { get; set; }
- /// <summary>
- /// 閲囪喘璁㈠崟ID
- ///</summary>
- [SugarColumn(ColumnName = "EBELN_K3ID")]
- public decimal? EbelnK3id { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟ID
+ ///</summary>
+ [SugarColumn(ColumnName = "EBELN_K3ID")]
+ public decimal? EbelnK3id { get; set; }
- /// <summary>
- /// 閲囪喘璁㈠崟琛孖D
- ///</summary>
- [SugarColumn(ColumnName = "LINE_K3ID")]
- public decimal? LineK3id { get; set; }
+ /// <summary>
+ /// 閲囪喘璁㈠崟琛孖D
+ ///</summary>
+ [SugarColumn(ColumnName = "LINE_K3ID")]
+ public decimal? LineK3id { get; set; }
- /// <summary>
- ///
- ///</summary>
- [SugarColumn(ColumnName = "ITEM_ID")]
- public decimal? ItemId { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "ITEM_ID")]
+ public decimal? ItemId { get; set; }
- /// <summary>
- /// 鐢熶骇宸ュ簭ID
- ///</summary>
- [SugarColumn(ColumnName = "GX_ID")]
- public decimal? GxId { get; set; }
+ /// <summary>
+ /// 鐢熶骇宸ュ簭ID
+ ///</summary>
+ [SugarColumn(ColumnName = "GX_ID")]
+ public decimal? GxId { get; set; }
- /// <summary>
- /// 缁勭粐id
- ///</summary>
- [SugarColumn(ColumnName = "ORG_NAME")]
- public string OrgName { get; set; }
+ /// <summary>
+ /// 缁勭粐id
+ ///</summary>
+ [SugarColumn(ColumnName = "ORG_NAME")]
+ public string OrgName { get; set; }
- /// <summary>
- /// 璐т富id
- ///</summary>
- [SugarColumn(ColumnName = "ORG_OWNER")]
- public string OrgOwner { get; set; }
- }
+ /// <summary>
+ /// 璐т富id
+ ///</summary>
+ [SugarColumn(ColumnName = "ORG_OWNER")]
+ public string OrgOwner { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemInCDetails.cs b/MES.Service/Modes/MesInvItemInCDetails.cs
index a2464d2..0bf8253 100644
--- a/MES.Service/Modes/MesInvItemInCDetails.cs
+++ b/MES.Service/Modes/MesInvItemInCDetails.cs
@@ -13,31 +13,31 @@
/// </summary>
[SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_INV_ID",
IsPrimaryKey = true)]
- public decimal? Id { get; set; }
+ public decimal Id { get; set; }
/// <summary>
/// 鍏ュ簱鍗昳d
/// </summary>
[SugarColumn(ColumnName = "ITEM_IN_ID", IsPrimaryKey = true)]
- public decimal? ItemInId { get; set; }
+ public decimal ItemInId { get; set; }
/// <summary>
/// 鐗╂枡鏉＄爜PSN
/// </summary>
[SugarColumn(ColumnName = "ITEM_BARCODE")]
- public string? ItemBarcode { get; set; }
+ public string ItemBarcode { get; set; }
/// <summary>
/// 瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
/// </summary>
[SugarColumn(ColumnName = "C_ITEM_CODE")]
- public string? CItemCode { get; set; }
+ public string CItemCode { get; set; }
/// <summary>
/// 瀹㈡埛鐗╂枡鏉＄爜
/// </summary>
[SugarColumn(ColumnName = "C_ITEM_BARCODE")]
- public string? CItemBarcode { get; set; }
+ public string CItemBarcode { get; set; }
/// <summary>
/// 楠屾敹鏁伴噺
@@ -61,7 +61,7 @@
/// 鍒涘缓浜�
/// </summary>
[SugarColumn(ColumnName = "CREATE_BY")]
- public string? CreateBy { get; set; }
+ public string CreateBy { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
@@ -73,7 +73,7 @@
/// 鏈�鍚庢洿鏂颁汉
/// </summary>
[SugarColumn(ColumnName = "LASTUPDATE_BY")]
- public string? LastupdateBy { get; set; }
+ public string LastupdateBy { get; set; }
/// <summary>
/// 鏈�鍚庢洿鏂版椂闂�
@@ -91,13 +91,13 @@
/// 鏈徃鐗╂枡缂栫爜锛堟棤鏉＄爜鎵嬪伐褰曞叆锛屾湁鏉＄爜涓哄啑浣欏瓧娈碉級
/// </summary>
[SugarColumn(ColumnName = "ITEM_NO")]
- public string? ItemNo { get; set; }
+ public string ItemNo { get; set; }
/// <summary>
/// 鍘傚鎵规
/// </summary>
[SugarColumn(ColumnName = "LOT_NO")]
- public string? LotNo { get; set; }
+ public string LotNo { get; set; }
/// <summary>
/// 鏄惁鍏辩鐗╂枡(0:鍚︼紝1:鏄�)
@@ -109,13 +109,13 @@
/// 瀹㈡埛缂栫爜
/// </summary>
[SugarColumn(ColumnName = "CUST_NO")]
- public string? CustNo { get; set; }
+ public string CustNo { get; set; }
/// <summary>
/// 妫�楠岀粨鏋�
/// </summary>
[SugarColumn(ColumnName = "CHECK_RES")]
- public string? CheckRes { get; set; }
+ public string CheckRes { get; set; }
/// <summary>
/// 杩涜揣鏁伴噺
@@ -127,7 +127,7 @@
/// 妫�楠岀姸鎬�
/// </summary>
[SugarColumn(ColumnName = "CHECK_STATES")]
- public string? CheckStates { get; set; }
+ public string CheckStates { get; set; }
/// <summary>
/// 寮哄埗鍏ュ簱鏍囪0鏃狅紝1-寮哄埗鍏ュ簱 閫�鏂欏崟浣跨敤
@@ -139,31 +139,31 @@
/// 浠撳簱缂栫爜
/// </summary>
[SugarColumn(ColumnName = "DEPOT_CODE")]
- public string? DepotCode { get; set; }
+ public string DepotCode { get; set; }
/// <summary>
/// 璐т綅缂栫爜
/// </summary>
[SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
- public string? DepotSectionCode { get; set; }
+ public string DepotSectionCode { get; set; }
/// <summary>
/// 鐗硅浜嬮」
/// </summary>
[SugarColumn(ColumnName = "REMARK")]
- public string? Remark { get; set; }
+ public string Remark { get; set; }
/// <summary>
/// 鐗╂枡鏉＄爜
/// </summary>
[SugarColumn(ColumnName = "ITEM_BARCODE2")]
- public string? ItemBarcode2 { get; set; }
+ public string ItemBarcode2 { get; set; }
/// <summary>
/// 鏂版潯鐮�
/// </summary>
[SugarColumn(ColumnName = "ITEM_BARCODE3")]
- public string? ItemBarcode3 { get; set; }
+ public string ItemBarcode3 { get; set; }
/// <summary>
/// 浣跨敤鏁伴噺
@@ -181,7 +181,7 @@
/// 鐗╂枡绠�绉�
/// </summary>
[SugarColumn(ColumnName = "ITEM_SNAME")]
- public string? ItemSname { get; set; }
+ public string ItemSname { get; set; }
/// <summary>
/// 妗ｄ綅浣庡��
@@ -205,7 +205,7 @@
/// 鍗曚綅
/// </summary>
[SugarColumn(ColumnName = "UNIT")]
- public string? Unit { get; set; }
+ public string Unit { get; set; }
/// <summary>
/// 鏄惁妫�楠�
@@ -217,19 +217,19 @@
/// 閲囪喘璁㈠崟
/// </summary>
[SugarColumn(ColumnName = "EBELN")]
- public string? Ebeln { get; set; }
+ public string Ebeln { get; set; }
/// <summary>
/// 鐢熶骇鏃ユ湡
/// </summary>
[SugarColumn(ColumnName = "LOT_DATE")]
- public string? LotDate { get; set; }
+ public string LotDate { get; set; }
/// <summary>
/// 鍏ュ簱鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "BILL_NO")]
- public string? BillNo { get; set; }
+ public string BillNo { get; set; }
/// <summary>
/// 鍏ュ簱瀹℃牳鏍囧織
@@ -241,25 +241,25 @@
/// 鍒嗗巶缂栫爜
/// </summary>
[SugarColumn(ColumnName = "FACTORY")]
- public string? Factory { get; set; }
+ public string Factory { get; set; }
/// <summary>
/// 鍏徃浠ｇ爜
/// </summary>
[SugarColumn(ColumnName = "COMPANY")]
- public string? Company { get; set; }
+ public string Company { get; set; }
/// <summary>
/// 鍗℃澘缂栫爜
/// </summary>
[SugarColumn(ColumnName = "CB_NO")]
- public string? CbNo { get; set; }
+ public string CbNo { get; set; }
/// <summary>
/// 绠卞彿
/// </summary>
[SugarColumn(ColumnName = "BOX_NO")]
- public string? BoxNo { get; set; }
+ public string BoxNo { get; set; }
/// <summary>
/// 浠撳簱ID
@@ -277,7 +277,7 @@
/// 琛屽彿
/// </summary>
[SugarColumn(ColumnName = "LINE_NUM")]
- public string? LineNum { get; set; }
+ public string LineNum { get; set; }
/// <summary>
/// 鎵爜鏁伴噺
@@ -289,7 +289,7 @@
/// 閿�鍞鍗�
/// </summary>
[SugarColumn(ColumnName = "VGBEL")]
- public string? Vgbel { get; set; }
+ public string Vgbel { get; set; }
/// <summary>
/// 閿�鍞鍗曡鍙�
@@ -301,7 +301,7 @@
/// 浠诲姟鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "WORK_NO")]
- public string? WorkNo { get; set; }
+ public string WorkNo { get; set; }
/// <summary>
/// 琛屽彿
@@ -313,7 +313,7 @@
/// 鍒拌揣鍗曞彿
/// </summary>
[SugarColumn(ColumnName = "CBILL_NO")]
- public string? CbillNo { get; set; }
+ public string CbillNo { get; set; }
/// <summary>
/// 鎬ユ枡鏍囪瘑
@@ -325,7 +325,7 @@
/// 浜у搧鍨嬪彿
/// </summary>
[SugarColumn(ColumnName = "BOARD_STYLE")]
- public string? BoardStyle { get; set; }
+ public string BoardStyle { get; set; }
/// <summary>
/// 浠诲姟鍗曡鍙�
@@ -337,41 +337,19 @@
/// 鐢熶骇宸ュ崟
/// </summary>
[SugarColumn(ColumnName = "TASK_NO")]
- public string? TaskNo { get; set; }
+ public string TaskNo { get; set; }
/// <summary>
/// 渚涘簲鍟�
/// </summary>
[SugarColumn(ColumnName = "SUPP_NO")]
- public string? SuppNo { get; set; }
+ public string SuppNo { get; set; }
/// <summary>
/// 浠诲姟姹囨姤鍗�
/// </summary>
[SugarColumn(ColumnName = "RBILL_NO")]
- public string? RbillNo { get; set; }
-
-
-
-
-
- /// <summary>
- /// 閲囪喘璁㈠崟id
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_K3ID")]
- public decimal? EbelnK3id { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟琛宨d
- /// </summary>
- [SugarColumn(ColumnName = "LINE_K3ID")]
- public decimal? LineK3id { get; set; }
-
- /// <summary>
- /// 鐗╂枡id
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_ID")]
- public decimal? ItemId { get; set; }
+ public string RbillNo { get; set; }
// 娣诲姞鐨勫瓧娈碉紝骞朵笖瀹冧滑涓嶅睘浜庢暟鎹簱琛�
[SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
diff --git a/MES.Service/Modes/MesInvItemInCItems.cs b/MES.Service/Modes/MesInvItemInCItems.cs
index 6cf9fb0..05e3293 100644
--- a/MES.Service/Modes/MesInvItemInCItems.cs
+++ b/MES.Service/Modes/MesInvItemInCItems.cs
@@ -145,22 +145,4 @@
/// </summary>
[SugarColumn(ColumnName = "SUPP_NO")]
public string SuppNo { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟id
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_K3ID")]
- public decimal EbelnK3id { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟id
- /// </summary>
- [SugarColumn(ColumnName = "LINE_K3ID")]
- public decimal LineK3id { get; set; }
-
- /// <summary>
- /// 鐗╂枡id
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_ID")]
- public decimal ItemId { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemOutCDetails.cs b/MES.Service/Modes/MesInvItemOutCDetails.cs
index 36fb5ee..13835d9 100644
--- a/MES.Service/Modes/MesInvItemOutCDetails.cs
+++ b/MES.Service/Modes/MesInvItemOutCDetails.cs
@@ -235,12 +235,6 @@
[SugarColumn(ColumnName = "LINE_K3ID")]
public decimal? LineK3id { get; set; }
- /// <summary>
- /// 鐗╂枡id
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_ID")]
- public decimal? ItemId { get; set; }
-
[SugarColumn(IsIgnore = true)] public string? DepotName { get; set; }
[SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
[SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
diff --git a/MES.Service/Modes/MesInvItemStocks.cs b/MES.Service/Modes/MesInvItemStocks.cs
index 6017a5b..2a5a4d1 100644
--- a/MES.Service/Modes/MesInvItemStocks.cs
+++ b/MES.Service/Modes/MesInvItemStocks.cs
@@ -200,10 +200,4 @@
/// </summary>
[SugarColumn(ColumnName = "LINE_K3ID")]
public decimal? LineK3id { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟琛宨d
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_ID")]
- public decimal? ItemId { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesItemType.cs b/MES.Service/Modes/MesItemType.cs
index 10c3cd4..23f72ed 100644
--- a/MES.Service/Modes/MesItemType.cs
+++ b/MES.Service/Modes/MesItemType.cs
@@ -83,16 +83,7 @@
/// </summary>
[SugarColumn(ColumnName = "PGROUP")]
public string? Pgroup { get; set; }
- /// <summary>
- /// 浣跨敤绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
- /// <summary>
- /// 鍓靛缓绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
+
/// <summary>
/// 鎻忚堪
/// </summary>
diff --git a/MES.Service/Modes/MesItems.cs b/MES.Service/Modes/MesItems.cs
index 0ae3080..c12394c 100644
--- a/MES.Service/Modes/MesItems.cs
+++ b/MES.Service/Modes/MesItems.cs
@@ -167,8 +167,8 @@
/// <summary>
/// 鐗╂枡鍒嗙被缂栧彿
/// </summary>
- /* [SugarColumn(ColumnName = "PPBOM00019124")]
- public string? Ppbom00019124 { get; set; }*/
+ [SugarColumn(ColumnName = "PPBOM00019124")]
+ public string? Ppbom00019124 { get; set; }
/// <summary>
/// 鐗╂枡鍒嗙粍
@@ -265,27 +265,6 @@
[SugarColumn(ColumnName = "SUBCON_UNIT")]
public string? SubconUnit { get; set; }
-
- /// <summary>
- /// 浣跨敤绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
- /// <summary>
- /// 鍓靛缓绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
-
- [SugarColumn(ColumnName = "FLOSSPERCENT")]
- public string? FLOSSPERCENT { get; set; }
-
- [SugarColumn(ColumnName = "FMnemonicCode")]
-
- public string? FMnemonicCode { get; set; }
-
- [SugarColumn(ColumnName = "FExpPeriod")]
- public string? FExpPeriod { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesPosition.cs b/MES.Service/Modes/MesPosition.cs
index 4b9c902..a2f13ce 100644
--- a/MES.Service/Modes/MesPosition.cs
+++ b/MES.Service/Modes/MesPosition.cs
@@ -62,15 +62,29 @@
public string? Fforbidstatus { get; set; }
/// <summary>
- /// 浣跨敤绲勭箶
/// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
+ [SugarColumn(ColumnName = "REMARK1")]
+ public string? Remark1 { get; set; }
+
/// <summary>
- /// 鍓靛缓绲勭箶
/// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
+ [SugarColumn(ColumnName = "REMARK2")]
+ public string? Remark2 { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK3")]
+ public string? Remark3 { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK4")]
+ public string? Remark4 { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK5")]
+ public string? Remark5 { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
diff --git a/MES.Service/Modes/MesQaItemsDetect01.cs b/MES.Service/Modes/MesQaItemsDetect01.cs
index d703155..2a26d0c 100644
--- a/MES.Service/Modes/MesQaItemsDetect01.cs
+++ b/MES.Service/Modes/MesQaItemsDetect01.cs
@@ -328,28 +328,4 @@
/// </summary>
[SugarColumn(ColumnName = "FMRMODE")]
public string Fmrmode { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟id
- /// </summary>
- [SugarColumn(ColumnName = "EBELN_K3ID")]
- public decimal EbelnK3id { get; set; }
-
- /// <summary>
- /// 閲囪喘璁㈠崟id
- /// </summary>
- [SugarColumn(ColumnName = "LINE_K3ID")]
- public decimal LineK3id { get; set; }
-
- /// <summary>
- /// 璐ㄩ噺瀹℃牳鏍囪瘑
- /// </summary>
- [SugarColumn(ColumnName = "QUALITY_AUDIT")]
- public decimal QualityAudit { get; set; }
-
- /// <summary>
- /// 鐗╂枡id
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_ID")]
- public decimal ItemId { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesRohIn.cs b/MES.Service/Modes/MesRohIn.cs
index a195a98..abdfd74 100644
--- a/MES.Service/Modes/MesRohIn.cs
+++ b/MES.Service/Modes/MesRohIn.cs
@@ -228,6 +228,12 @@
public string? CheckBy { get; set; }
/// <summary>
+ /// 瀹℃牳鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_FALG")]
+ public short? CheckFalg { get; set; }
+
+ /// <summary>
/// 鑷畾涔夊瓧娈�1
/// </summary>
[SugarColumn(ColumnName = "changereason")]
diff --git a/MES.Service/Modes/MesRohInData.cs b/MES.Service/Modes/MesRohInData.cs
index bd6b528..0fd7920 100644
--- a/MES.Service/Modes/MesRohInData.cs
+++ b/MES.Service/Modes/MesRohInData.cs
@@ -347,16 +347,4 @@
/// </summary>
[SugarColumn(ColumnName = "SETTLEMENT")]
public string? Settlement { get; set; }
-
- /// <summary>
- /// 闇�姹傞儴闂�
- /// </summary>
- [SugarColumn(ColumnName = "DEMAND_DEPARTMENT")]
- public string? DemandDepartment { get; set; }
-
- /// <summary>
- /// 鏀舵枡閮ㄩ棬
- /// </summary>
- [SugarColumn(ColumnName = "RECEIVING_DEPARTMENT")]
- public string? ReceivingDepartment { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesStaff.cs b/MES.Service/Modes/MesStaff.cs
index 7ac042c..0b7e36c 100644
--- a/MES.Service/Modes/MesStaff.cs
+++ b/MES.Service/Modes/MesStaff.cs
@@ -147,15 +147,4 @@
public string FforbidStatus { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
- /// <summary>
- /// 浣跨敤绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
- /// <summary>
- /// 鍓靛缓绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
-
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesSupplier.cs b/MES.Service/Modes/MesSupplier.cs
index 9a5440f..8736c2b 100644
--- a/MES.Service/Modes/MesSupplier.cs
+++ b/MES.Service/Modes/MesSupplier.cs
@@ -143,32 +143,32 @@
/// <summary>
/// 鑷畾涔夊瓧娈�1
/// </summary>
- [SugarColumn(ColumnName = "TYPE")]
- public string? type { get; set; }
+ [SugarColumn(ColumnName = "REMARK1")]
+ public string? Remark1 { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�2
/// </summary>
- [SugarColumn(ColumnName = "fremarks")]
- public string? fremarks { get; set; }
+ [SugarColumn(ColumnName = "REMARK2")]
+ public string? Remark2 { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�3
/// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
+ [SugarColumn(ColumnName = "REMARK3")]
+ public string? Remark3 { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�4
/// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
+ [SugarColumn(ColumnName = "REMARK4")]
+ public string? Remark4 { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�5
/// </summary>
- /* [SugarColumn(ColumnName = "REMARK5")]
- public string? Remark5 { get; set; }*/
+ [SugarColumn(ColumnName = "REMARK5")]
+ public string? Remark5 { get; set; }
[SugarColumn(IsIgnore = true)] public string? Type { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Organize.cs b/MES.Service/Modes/Organize.cs
index b7888d4..50d4342 100644
--- a/MES.Service/Modes/Organize.cs
+++ b/MES.Service/Modes/Organize.cs
@@ -1,40 +1,37 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using SqlSugar;
-namespace MES.Service.Modes
+锘縰sing SqlSugar;
+
+namespace MES.Service.Modes;
+
+/// <summary>
+/// </summary>
+[SugarTable("ORGANIZE")]
+public class Organize
{
/// <summary>
- /// 缁勭粐
- ///</summary>
- [SugarTable("ORGANIZE")]
- public class Organize
- {
- /// <summary>
- /// 缂栫爜
- ///</summary>
- [SugarColumn(ColumnName="FNUMBER" )]
- public string Fnumber { get; set; }
- /// <summary>
- /// 鍚嶇О
- ///</summary>
- [SugarColumn(ColumnName="FNAME" )]
- public string Fname { get; set; }
- /// <summary>
- ///
- ///</summary>
- // [SugarColumn(ColumnName="ID" )]
- [SugarColumn(IsPrimaryKey = true)]
- public string Id { get; set; }
- /// <summary>
- /// 绂佺敤鐘舵��
- ///</summary>
- [SugarColumn(ColumnName="FFORBIDSTATUS" )]
- public string Fforbidstatus { get; set; }
- /// <summary>
- /// 鎿嶄綔绫诲瀷
- ///</summary>
- [SugarColumn(ColumnName="TYPE" )]
- public string Type { get; set; }
- }
-}
+ ///
+ /// </summary>
+ [SugarColumn(ColumnName = "ID")]
+ public decimal? Id { get; set; }
+
+ /// <summary>
+ /// 缁勭粐鑻辨枃
+ /// </summary>
+ [SugarColumn(ColumnName = "FNUMBER")]
+ public string Fnumber { get; set; }
+
+ /// <summary>
+ /// 缁勭粐鍚�
+ /// </summary>
+ [SugarColumn(ColumnName = "FNAME")]
+ public string Fname { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FFORBIDSTATUS")]
+ public string Fforbidstatus { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "TYPE")]
+ public string Type { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Modes/Purdkb.cs b/MES.Service/Modes/Purdkb.cs
index 3767cc1..6a0cb38 100644
--- a/MES.Service/Modes/Purdkb.cs
+++ b/MES.Service/Modes/Purdkb.cs
@@ -139,10 +139,4 @@
/// </summary>
[SugarColumn(ColumnName = "DKB018")]
public string Dkb018 { get; set; }
-
- /// <summary>
- /// 鐗╂枡id
- /// </summary>
- [SugarColumn(ColumnName = "ITEM_ID")]
- public string ItemId { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/SysDepartment.cs b/MES.Service/Modes/SysDepartment.cs
index f3bc3ba..f2b6669 100644
--- a/MES.Service/Modes/SysDepartment.cs
+++ b/MES.Service/Modes/SysDepartment.cs
@@ -136,20 +136,8 @@
/// <summary>
/// 鑷畾涔夊瓧娈�1
/// </summary>
- [SugarColumn(ColumnName = "FParentID")]
- public string? FParentID { get; set; }
-
- /// <summary>
- /// 浣跨敤绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "FSubsidiary")]
- public string? FSubsidiary { get; set; }
- /// <summary>
- /// 鍓靛缓绲勭箶
- /// </summary>
- [SugarColumn(ColumnName = "Fumbrella")]
- public string? Fumbrella { get; set; }
-
+ [SugarColumn(ColumnName = "REMARK1")]
+ public string? Remark1 { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�2
diff --git a/MES.Service/Modes/Womcab.cs b/MES.Service/Modes/Womcab.cs
index 277f35b..1ec7044 100644
--- a/MES.Service/Modes/Womcab.cs
+++ b/MES.Service/Modes/Womcab.cs
@@ -154,14 +154,14 @@
public string? Denominator { get; set; }
/// <summary>
- /// 鍒嗗瓙
+ /// 鍥哄畾鎹熻��
/// </summary>
[SugarColumn(ColumnName = "SCRAPQTY")]
- public string? Scrapqty { get; set; }
+ public decimal? SCRAPQTY { get; set; }
/// <summary>
- /// 鍒嗘瘝
+ /// 鍙樺姩鎹熻�楃巼
/// </summary>
[SugarColumn(ColumnName = "SCRAPRATE")]
- public string? Scraprate { get; set; }
+ public decimal? SCRAPRATE { 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 017d8ba..1fc62c1 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 41774a5..d303498 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/MesCustomerManager.cs b/MES.Service/service/BasicData/MesCustomerManager.cs
index b89d003..774f869 100644
--- a/MES.Service/service/BasicData/MesCustomerManager.cs
+++ b/MES.Service/service/BasicData/MesCustomerManager.cs
@@ -120,9 +120,6 @@
private MesCustomer GetSysDepartment(ErpCustomer customer)
{
-
- //ERP鍌宠几鐨勬帴鍙ｆ暩鎿氳綁鎻涚偤MES鏁告摎搴瓧娈�
-
return new MesCustomer
{
Id = Convert.ToDecimal(customer.Id),
@@ -133,11 +130,6 @@
Telf1 = customer.Fmobilephone,
Fseller = customer.Fseller,
Fforbidstatus = customer.FForbidStatus,
- fremarks =customer.Fremarks,
- FSubsidiary =customer.FSubsidiary,
- Fumbrella = customer.Fumbrella,
- CreateDate=DateTime.Now,
- LastupdateDate=DateTime.Now,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/MesDepotsManager.cs b/MES.Service/service/BasicData/MesDepotsManager.cs
index 34b8bc0..d10b6f7 100644
--- a/MES.Service/service/BasicData/MesDepotsManager.cs
+++ b/MES.Service/service/BasicData/MesDepotsManager.cs
@@ -1,5 +1,4 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -114,12 +113,6 @@
Depottype = depots.FStockProperty,
IsNg = depots.FForbidStatus,
Zuid = depots.FGroup,
- FSubsidiary = depots.FSubsidiary,
- Fumbrella = depots.Fumbrella,
- FSUPPLIERID = depots.FSUPPLIERID,
- Fdeptid = depots.Fdeptid,
- CreateDate=DateTime.Now,
- LastupdateDate=DateTime.Now,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/MesItemTypeManager.cs b/MES.Service/service/BasicData/MesItemTypeManager.cs
index d3a5178..6aea112 100644
--- a/MES.Service/service/BasicData/MesItemTypeManager.cs
+++ b/MES.Service/service/BasicData/MesItemTypeManager.cs
@@ -1,5 +1,4 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
@@ -58,10 +57,6 @@
Tcode = department.FNumber,
Tname = department.FName,
Description = department.FDescription,
- FSubsidiary = department.FSubsidiary,
- Fumbrella = department.Fumbrella,
- CreateDate = DateTime.Now,
- LastupdateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index 019e483..868bcaf 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -1,5 +1,4 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.service;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
@@ -16,7 +15,8 @@
&& c.Company == query.Company
&& c.ItemNo == query.ItemNo).First();
}
-
+
+
public bool Save(ErpItems item)
{
var entity = GetMesItems(item);
@@ -138,6 +138,7 @@
Highlimit = item.FMaxStock,
PrdPack = item.FMinPackCount,
DepotCode = item.FStockId,
+ Ppbom00019124 = item.PPBOM00019124,
Fmaterialgroup = item.FMaterialGroup,
Remarks = item.FDescription,
Ffinishreceiptoverrate = item.FFinishReceiptOverRate,
@@ -152,13 +153,6 @@
ProductionWorkshop = item.FWorkShopId,
ProduceUnit = item.FPRODUCEUNITID,
SubconUnit = item.FSUBCONUNITID,
- FSubsidiary = item.FSubsidiary,
- Fumbrella = item.Fumbrella,
- FLOSSPERCENT = item.FLOSSPERCENT ,
- FMnemonicCode = item.FMnemonicCode,
- FExpPeriod = item.FExpPeriod,
- LastupdateDate=DateTime.Now,
- CreateDate=DateTime.Now,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/MesPositionManager.cs b/MES.Service/service/BasicData/MesPositionManager.cs
index c7d02e7..a670906 100644
--- a/MES.Service/service/BasicData/MesPositionManager.cs
+++ b/MES.Service/service/BasicData/MesPositionManager.cs
@@ -1,5 +1,4 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -103,8 +102,6 @@
PositionDescription = position.FDESCRIPTIONS,
Department = position.FDept,
Fforbidstatus = position.FForbidStatus,
- FSubsidiary = position.FSubsidiary,
- Fumbrella = position.Fumbrella,
CreationDate = position.FCreateDate != null
? DateTime.ParseExact(position.FCreateDate,
"yyyy-MM-dd HH:mm:ss", null)
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index cd79236..35acb3c 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -14,18 +14,25 @@
{
var rohInErpRohIn = rohIn.ErpRohIn;
var mesRohIn = GetMesRohIn(rohInErpRohIn);
- var mesRohInDatas = GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type);
+ var mesRohInDatas =
+ GetMesRohInDatas(rohIn.ErpRohinDatas, rohInErpRohIn.Type);
return UseTransaction(db =>
{
switch (rohInErpRohIn.Type)
{
- case "2":
- case "4":
- case "5":
- return SaveOrUpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
+ // case "2":
+ // return InsertData(db, mesRohIn, mesRohInDatas,
+ // rohInErpRohIn.FBILLTYPE)
+ // ? 1
+ // : 0;
case "3":
return UpdateData(db, mesRohIn, mesRohInDatas) ? 1 : 0;
+ case "2":
+ case "4":
+ return SaveOrUpdateData(db, mesRohIn, mesRohInDatas)
+ ? 1
+ : 0;
default:
throw new NotImplementedException(
$"type娌℃湁{rohInErpRohIn.Type}杩欎釜绫诲瀷");
@@ -140,13 +147,13 @@
mesRohIn.PurchaseGroup = rohIn.FPurchaserGroupId;
mesRohIn.QtyAcceptance = rohIn.Facctype;
mesRohIn.Purchaser = rohIn.FPurchaserId;
- //mesRohIn.QualityReq = rohIn.F_UNW_Remarks_zlyq;
+ mesRohIn.QualityReq = rohIn.F_UNW_Remarks_zlyq;
mesRohIn.SettlementParty = rohIn.FSettleId;
mesRohIn.PaymentParty = rohIn.FChargeId;
- // mesRohIn.Email = rohIn.FProviderEMail;
- // mesRohIn.TransportMethod = rohIn.F_UNW_Text_ysfs;
- mesRohIn.Remarks = rohIn.FHEADNOTE;
- // mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj;
+ mesRohIn.Email = rohIn.FProviderEMail;
+ mesRohIn.TransportMethod = rohIn.F_UNW_Text_ysfs;
+ mesRohIn.Remarks = rohIn.F_UNW_BZ;
+ mesRohIn.FixtureMoldProcurement = rohIn.F_UNW_Combo_zjmj;
mesRohIn.CancellationStatus = rohIn.FCancelStatus;
mesRohIn.CancellationPerson = rohIn.FCancellerId;
@@ -185,12 +192,13 @@
EbelnK3id = Convert.ToDecimal(s.id),
ErpId = Convert.ToDecimal(s.Eid),
BillNo = s.FBillNo,
- SalesOrderId=s.FDEMANDBILLNO,
- OrderLineId=s.FSEQ,
+ SalesOrderId = s.F_UNW_Text_xsddh,
ItemId = s.FMaterialId,
PurchaseUnit = s.FUnitId,
PurchaseQty = Convert.ToDecimal(s.FQty),
InventoryUnit = s.FStockUnitID,
+ PricingUnit = s.FPriceUnitId,
+ PricingQty = Convert.ToDecimal(s.FPriceUnitQty),
DeliveryDate = s.FDeliveryDate != null
? DateTime.ParseExact(s.FDeliveryDate,
"yyyy-MM-dd HH:mm:ss", null)
@@ -204,7 +212,7 @@
"yyyy-MM-dd HH:mm:ss", null)
: null,
IsGift = s.FGiveAway,
- Remarks = s.Fnote,
+ Remarks = s.FEntryNote,
SupplierItemCode = s.FSupMatId,
SupplierItemName = s.FSupMatName,
OutsourcingOrderId = s.FSUBREQBILLNO,
@@ -238,15 +246,10 @@
DemandSource = s.FDEMANDTYPE,
DemandDocumentId = s.FDEMANDBILLNO,
DemandDocumentLineId = s.FDEMANDBILLENTRYSEQ,
- DemandOrg = s.FRequireOrgId,
- ReceivingOrg = s.FReceiveOrgId,
- SettlementOrg = s.FSETTLEORGID,
- PurchaseOrderLineNumber = s.FSEQ,
- Demand =s.FRequireOrgId,
- Receiving = s.FReceiveOrgId,
- Settlement =s.FSETTLEORGID,
- DemandDepartment = s.FRequireDeptId,
- ReceivingDepartment = s.FReceiveDeptId
+ PurchaseOrderLineNumber = s.PurchaseOrderLineNumber,
+ Demand = s.Demand,
+ Receiving = s.Receiving,
+ Settlement = s.Settlement
};
var single = rohInDataManager.GetSingle(it =>
diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index b59bf83..1f5f4dc 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -1,5 +1,4 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -119,11 +118,7 @@
PositionName = staff.FPost,
PhoneNumber = staff.FMobile,
Remark = staff.FDescription,
- FforbidStatus = staff.FForbidStatus,
- FSubsidiary = staff.FSubsidiary,
- Fumbrella = staff.Fumbrella,
- CreateDate = DateTime.Now,
- LastupdateDate = DateTime.Now,
+ FforbidStatus = staff.FForbidStatus
};
if (staff.FStaffStartDate != null)
@@ -142,7 +137,7 @@
Fcode = staff.FStaffNumber,
Fname = staff.FName,
Fpassword = "8+()./,", // 鍒濆瀵嗙爜
- Fsystem = "澶忚挋",
+ Fsystem = "涓婃牸",
Lever = 0,
Fcompany = "1000",
Ffactory = "1000",
diff --git a/MES.Service/service/BasicData/MesSupplierManager.cs b/MES.Service/service/BasicData/MesSupplierManager.cs
index ac0c78c..f64e2e9 100644
--- a/MES.Service/service/BasicData/MesSupplierManager.cs
+++ b/MES.Service/service/BasicData/MesSupplierManager.cs
@@ -1,5 +1,4 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -128,12 +127,6 @@
Telf1 = supplier.F_UNW_LXRDH,
Fstaffid = supplier.FStaffId,
Fforbidstatus = supplier.FForbidStatus,
- type= supplier.Type,
- fremarks = supplier.Fremarks,
- FSubsidiary = supplier.Fsubsidiary,
- Fumbrella = supplier.Fumbrella,
- CreateDate = DateTime.Now,
- LastupdateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/MesUnitManager.cs b/MES.Service/service/BasicData/MesUnitManager.cs
index 5e71919..3135863 100644
--- a/MES.Service/service/BasicData/MesUnitManager.cs
+++ b/MES.Service/service/BasicData/MesUnitManager.cs
@@ -131,8 +131,6 @@
Fprecision = unit.FPrecision,
Fdescription = unit.FDescription,
Fforbidstatus = unit.FForbidStatus,
- CreateDate = DateTime.Now,
- LastupdateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/BasicData/OrganizeManager.cs b/MES.Service/service/BasicData/OrganizeManager.cs
deleted file mode 100644
index 7b16af6..0000000
--- a/MES.Service/service/BasicData/OrganizeManager.cs
+++ /dev/null
@@ -1,257 +0,0 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using MES.Service.DB;
-using MES.Service.Modes;
-using MES.Service.Dto.webApi;
-using System.Xml.Linq;
-
-namespace MES.Service.service
-{
-public class OrganizeManager : Repository<Organize>
-{
-
- //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
-
- //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 OrganizeManager.cs
- public bool Save(ErpOrganize item)
- {
- var entity = GetOrganize(item);
-
- return UseTransaction(db =>
- {
- switch (item.Type)
- {
- case "0":
- if (UpdateOrganizetatus(db, entity.Id, "A"))
- return 1;
- break;
- case "1":
- if (UpdateOrganizetatus(db, entity.Id, "B"))
- return 1;
- break;
- case "2":
- if (InsertItem(db, entity))
- return 1;
- break;
- case "3":
- if (DeleteItem(db, Convert.ToDecimal(entity.Id)))
- return 1;
- break;
- case "4":
- if (InsertOrUpdate(db, entity))
- return 1;
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{item.Type}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- throw new NotImplementedException("鎿嶄綔澶辫触");
- }) > 0;
- }
-
- public bool SaveList(List<ErpOrganize> Organize)
- {
- var list = Organize.Select(GetOrganize).ToList();
- var groupBy = list.GroupBy(s => s.Type)
- .ToDictionary(g => g.Key, g => g.ToList());
-
- return UseTransaction(db =>
- {
- foreach (var itemGroup in groupBy)
- switch (itemGroup.Key)
- {
- case "0":
- if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "A"))
- throw new NotImplementedException("鍚敤澶辫触");
- break;
- case "1":
- if (!UpdateOrganizetatusBatch(db, itemGroup.Value, "B"))
- throw new NotImplementedException("绂佺敤澶辫触");
- break;
- case "2":
- if (!InsertItemBatch(db, itemGroup.Value))
- throw new NotImplementedException("鎻掑叆澶辫触");
- break;
- case "3":
- if (!DeleteItemBatch(db, itemGroup.Value))
- throw new NotImplementedException("鍒犻櫎澶辫触");
- break;
- case "4":
- if (!InsertOrUpdateBatch(db, itemGroup.Value))
- throw new NotImplementedException("鍚屾澶辫触");
- break;
- default:
- throw new ArgumentNullException(
- $"type娌℃湁{itemGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�");
- }
-
- return 1;
- }) > 0;
- }
-
- private bool UpdateOrganizetatus(SqlSugarScope db, string itemId,
- string status)
- {
- var result = db.Updateable<Organize>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => s.Id == itemId).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- private bool InsertItem(SqlSugarScope db, Organize entity)
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteItem(SqlSugarScope db, decimal itemId)
- {
- var deleteById = db.Deleteable<Organize>().In(itemId).ExecuteCommand();
- if (deleteById > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- private Organize GetOrganize(ErpOrganize Organize)
- {
- return new Organize
- {
-
- Id = Organize.Id,
- Fnumber = Organize.FNumber,
- Fname = Organize.FName,
- Fforbidstatus = Organize.FForbidStatus,
- Type = Organize.Type
- };
- }
-
- private bool UpdateOrganizetatusBatch(SqlSugarScope db,
- List<Organize> itemList, string status)
- {
- var ids = itemList.Select(it => it.Id).ToArray();
- var result = db.Updateable<Organize>()
- .SetColumns(s => s.Fforbidstatus == status)
- .Where(s => ids.Contains(s.Id)).ExecuteCommand();
-
- if (result > 0)
- return true;
-
- throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触");
- }
-
- private bool InsertItemBatch(SqlSugarScope db, List<Organize> itemList)
- {
- var insertRange = db.Insertable(itemList).ExecuteCommand();
- if (insertRange > 0)
- return true;
-
- throw new NotImplementedException("鎻掑叆澶辫触");
- }
-
- private bool DeleteItemBatch(SqlSugarScope db, List<Organize> itemList)
- {
- var ids = itemList.Select(it => it.Id).ToArray();
- var deleteByIds = db.Deleteable<Organize>().In(ids).ExecuteCommand();
- if (deleteByIds > 0)
- return true;
-
- throw new NotImplementedException("鍒犻櫎澶辫触");
- }
-
- private bool InsertOrUpdate(SqlSugarScope db, Organize entity)
- {
- var exists = db.Queryable<Organize>().Any(e => e.Id == entity.Id);
- if (exists)
- {
- var update = db.Updateable(entity).ExecuteCommand();
- if (update > 0)
- return true;
- }
- else
- {
- var insert = db.Insertable(entity).ExecuteCommand();
- if (insert > 0)
- return true;
- }
-
- return false;
- }
-
- private bool InsertOrUpdateBatch(SqlSugarScope db, List<Organize> itemList)
- {
- foreach (var entity in itemList)
- if (!InsertOrUpdate(db, entity))
- return false;
-
- return true;
- }
- #region 鏁欏鏂规硶
- /// <summary>
- /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠ｇ爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
- /// </summary>
- public void Study()
- {
-
- /*********鏌ヨ*********/
-
- var data1 = base.GetById(1);//鏍规嵁ID鏌ヨ
- var data2 = base.GetList();//鏌ヨ鎵�鏈�
- var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ
- //var data4 = base.GetSingle(it => 1 == 1);//鏍规嵁鏉′欢鏌ヨ涓�鏉�,濡傛灉瓒呰繃涓�鏉′細鎶ラ敊
-
- var p = new PageModel() { PageIndex = 1, PageSize = 2 };// 鍒嗛〉鏌ヨ
- var data5 = base.GetPageList(it => 1 == 1, p);
- Console.Write(p.TotalCount);//杩斿洖鎬绘暟
-
- var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom(), OrderByType.Asc);// 鍒嗛〉鏌ヨ鍔犳帓搴�
- Console.Write(p.TotalCount);//杩斿洖鎬绘暟
-
- List<IConditionalModel> conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
- conModels.Add(new ConditionalModel() { FieldName= typeof(Organize).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1
- var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);
-
- base.AsQueryable().Where(x => 1 == 1).ToList();//鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
-
-
-
- /*********鎻掑叆*********/
- var insertData = new Organize() { };//娴嬭瘯鍙傛暟
- var insertArray = new Organize[] { insertData };
- base.Insert(insertData);//鎻掑叆
- base.InsertRange(insertArray);//鎵归噺鎻掑叆
- var id = base.InsertReturnIdentity(insertData);//鎻掑叆杩斿洖鑷鍒�
- base.AsInsertable(insertData).ExecuteCommand();//鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
-
-
-
- /*********鏇存柊*********/
- var updateData = new Organize() { };//娴嬭瘯鍙傛暟
- var updateArray = new Organize[] { updateData };//娴嬭瘯鍙傛暟
- base.Update(updateData);//鏍规嵁瀹炰綋鏇存柊
- base.UpdateRange(updateArray);//鎵归噺鏇存柊
- //base.Update(it => new Organize() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
- base.AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
-
-
-
- /*********鍒犻櫎*********/
- var deldata = new Organize() { };//娴嬭瘯鍙傛暟
- base.Delete(deldata);//鏍规嵁瀹炰綋鍒犻櫎
- base.DeleteById(1);//鏍规嵁涓婚敭鍒犻櫎
- base.DeleteById(new int[] { 1,2});//鏍规嵁涓婚敭鏁扮粍鍒犻櫎
- base.Delete(it=>1==2);//鏍规嵁鏉′欢鍒犻櫎
- base.AsDeleteable().Where(it=>1==2).ExecuteCommand();//杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
- }
- #endregion
- }
-}
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/SysDepartmentManager.cs b/MES.Service/service/BasicData/SysDepartmentManager.cs
index 0b30a98..21efa39 100644
--- a/MES.Service/service/BasicData/SysDepartmentManager.cs
+++ b/MES.Service/service/BasicData/SysDepartmentManager.cs
@@ -1,5 +1,4 @@
-锘縰sing Castle.Core.Resource;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using SqlSugar;
@@ -118,11 +117,6 @@
Depextr2 = department.FGroup,
Depextr3 = department.FWIPStockID,
Depextr4 = department.FForbidStatus,
- FParentID= department.FParentID,
- FSubsidiary = department.FSubsidiary,
- Fumbrella = department.Fumbrella,
- CreateDate = DateTime.Now,
- LastupdateDate = DateTime.Now,
Company = "1000",
Factory = "1000"
};
diff --git a/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs b/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
index de91d70..f4a9f24 100644
--- a/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
@@ -25,7 +25,7 @@
(c, t, u) => new object[]
{
JoinType.Left,
- c.ItemId == t.Id && c.Company == t.Company &&
+ c.ItemNo == t.ItemNo && c.Company == t.Company &&
c.Factory == t.Factory,
JoinType.Left,
t.Fpurchaseunitid == u.Id && t.Factory == u.Factory &&
@@ -63,9 +63,9 @@
(a, d, b, c, t, z) => new object[]
{
JoinType.Inner, d.BillNo == a.LotNo,
- JoinType.Inner, d.Id == b.Mid && b.ItemId == a.ItemId,
+ JoinType.Inner, d.Id == b.Mid && b.ItemNo == a.ItemNo,
JoinType.Inner,
- a.ItemId == c.Id && a.Company == c.Company &&
+ a.ItemNo == c.ItemNo && a.Company == c.Company &&
a.Factory == c.Factory,
JoinType.Inner, c.Fpurchaseunitid == t.Id,
JoinType.Inner, z.ReleaseNo == a.ReleaseNo
diff --git a/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs b/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
index fd320ee..48f5973 100644
--- a/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemInCDetailsManager.cs
@@ -120,7 +120,7 @@
var result = Db.Queryable<MesInvItemInCDetails, MesItems, MesUnit>(
(g, c, d) => new JoinQueryInfos(
JoinType.Left,
- g.ItemId == c.Id && g.Company == c.Company &&
+ g.ItemNo == c.ItemNo && g.Company == c.Company &&
g.Factory == c.Factory, JoinType.Inner,
d.Id == Convert.ToDecimal(c.ItemUnit)
)
@@ -234,7 +234,7 @@
MesInvItemArnDetail>(
(g, c, d, a) => new JoinQueryInfos(
JoinType.Left,
- g.ItemId == c.Id && g.Company == c.Company &&
+ g.ItemNo == c.ItemNo && g.Company == c.Company &&
g.Factory == c.Factory, JoinType.Inner,
d.Id == Convert.ToDecimal(c.ItemUnit),
JoinType.Inner,
diff --git a/MES.Service/service/Warehouse/MesInvItemMovesManager.cs b/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
index 7f4e1df..ce0d8ce 100644
--- a/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemMovesManager.cs
@@ -171,7 +171,7 @@
private List<MesInvItemOutItems> GetItemOutItems(WarehouseQuery query)
{
var sql = string.Format(
- "SELECT C.ITEM_NO,C.QUANTITY, C.REMARK,C.REMARK,S.ITEM_NAME, S.ITEM_MODEL, U.FNAME ITEM_UNIT, D.QUANTITY_OK,NVL(ST.QUANTITY, 0) WLKC FROM MES_INV_ITEM_OUT_ITEMS C JOIN MES_ITEMS S ON C.ITEM_ID = S.ID LEFT JOIN MES_UNIT U ON U.ID = S.ITEM_UNIT LEFT JOIN MES_DEPOTS P ON P.DEPOT_CODE = C.DEPOT_CODE LEFT JOIN MES_DEPOT_SECTIONS E ON E.DEPOT_SECTION_CODE = C.DEPOT_SECTION_CODE LEFT JOIN (SELECT ITEM_MOVE_ID, ITEM_NO, SUM(QUANTITY) QUANTITY_OK FROM MES_INV_ITEM_MOVES_C_DETAILS GROUP BY ITEM_MOVE_ID, ITEM_NO) D ON D.ITEM_MOVE_ID = C.ITEM_OUT_ID AND D.ITEM_NO = C.ITEM_NO LEFT JOIN MES_INV_ITEM_MOVES A ON A.ID = C.ITEM_OUT_ID left join (SELECT ITEM_ID, SUM(QUANTITY) QUANTITY, DEPOTS_CODE FROM MES_INV_ITEM_STOCKS GROUP BY ITEM_ID, DEPOTS_CODE) ST ON C.ITEM_ID = ST.ITEM_ID AND ST.DEPOTS_CODE = A.FROM_DEPOTS_CODE where C.ITEM_OUT_ID = {0}",
+ "SELECT C.ITEM_NO, C.QUANTITY, C.REMARK, C.REMARK, S.ITEM_NAME, S.ITEM_MODEL, U.FNAME ITEM_UNIT, D.QUANTITY_OK, NVL(ST.QUANTITY, 0) WLKC FROM MES_INV_ITEM_OUT_ITEMS C JOIN MES_ITEMS S ON C.ITEM_ID = S.ID LEFT JOIN MES_UNIT U ON U.ID = S.ITEM_UNIT LEFT JOIN MES_DEPOTS P ON P.DEPOT_CODE = C.DEPOT_CODE LEFT JOIN MES_DEPOT_SECTIONS E ON E.DEPOT_SECTION_CODE = C.DEPOT_SECTION_CODE LEFT JOIN (SELECT ITEM_MOVE_ID, ITEM_NO, SUM(QUANTITY) QUANTITY_OK FROM MES_INV_ITEM_MOVES_C_DETAILS GROUP BY ITEM_MOVE_ID, ITEM_NO) D ON D.ITEM_MOVE_ID = C.ITEM_OUT_ID AND D.ITEM_NO = C.ITEM_NO LEFT JOIN MES_INV_ITEM_MOVES A ON A.ID = C.ITEM_OUT_ID left join (SELECT ITEM_ID, SUM(QUANTITY) QUANTITY, DEPOTS_CODE FROM MES_INV_ITEM_STOCKS GROUP BY ITEM_ID, DEPOTS_CODE) ST ON C.ITEM_ID = ST.ITEM_ID AND ST.DEPOTS_CODE = A.FROM_DEPOTS_CODE where C.ITEM_OUT_ID = {0}",
query.id);
return Db.Ado.SqlQuery<MesInvItemOutItems>(sql);
diff --git a/MES.Service/service/Warehouse/MesInvItemOutsManager.cs b/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
index c576127..08b04e2 100644
--- a/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
+++ b/MES.Service/service/Warehouse/MesInvItemOutsManager.cs
@@ -142,12 +142,12 @@
SELECT SUM(C.QUANTITY) AS SQ_QTY, SUM(D.QUANTITY_OK) AS OK_QTY
FROM MES_INV_ITEM_OUT_ITEMS C
LEFT JOIN (
- SELECT ITEM_OUT_ID, ITEM_NO,ITEM_ID, PBILL_NO, RK_NO, SUM(QUANTITY) AS QUANTITY_OK
+ SELECT ITEM_OUT_ID, ITEM_NO, PBILL_NO, RK_NO, SUM(QUANTITY) AS QUANTITY_OK
FROM MES_INV_ITEM_OUT_C_DETAILS
- GROUP BY ITEM_OUT_ID, ITEM_NO,ITEM_ID, PBILL_NO, RK_NO
+ GROUP BY ITEM_OUT_ID, ITEM_NO, PBILL_NO, RK_NO
) D
ON D.ITEM_OUT_ID = C.ITEM_OUT_ID
- AND D.ITEM_ID = C.ITEM_ID
+ AND D.ITEM_NO = C.ITEM_NO
AND D.RK_NO = C.RK_NO
AND NVL(C.PBILL_NO, '0') = NVL(D.PBILL_NO, '0')
WHERE C.ITEM_OUT_ID = {0}", mesInvItemOuts.Id);
@@ -227,24 +227,22 @@
FROM MES_INV_ITEM_OUT_ITEMS C
LEFT JOIN (SELECT SUM(QUANTITY) KT_QTY,
ITEM_NO,
- ITEM_ID,
PBILL_NO,
RK_NO,
WORK_LINE
FROM MES_INV_ITEM_OUT_ITEMS
- GROUP BY ITEM_NO,ITEM_ID, PBILL_NO, WORK_LINE,RK_NO) U
- ON U.ITEM_ID = C.ITEM_ID
+ GROUP BY ITEM_NO, PBILL_NO, WORK_LINE,RK_NO) U
+ ON U.ITEM_NO = C.ITEM_NO
AND U.WORK_LINE = C.WORK_LINE
AND U.PBILL_NO = C.PBILL_NO
AND U.RK_NO = C.RK_NO
LEFT JOIN (SELECT SUM(QUANTITY) RK_QTY,
ITEM_NO,
- ITEM_ID,
EBELN,
WORK_LINE,BILL_NO
FROM MES_INV_ITEM_IN_C_ITEMS
GROUP BY ITEM_NO, EBELN, WORK_LINE,BILL_NO) s1
- ON S1.ITEM_ID = C.ITEM_ID
+ ON S1.ITEM_NO = C.ITEM_NO
AND S1.WORK_LINE = C.WORK_LINE
AND S1.EBELN = C.PBILL_NO
AND S1.BILL_NO = C.RK_NO
@@ -260,7 +258,7 @@
// 鍒ゆ柇琛屾槸鍚﹂噸澶�
var cf_Num = Db.Queryable<MesInvItemOutItems>()
- .Where(s1 => s1.ItemId == item.ItemId &&
+ .Where(s1 => s1.ItemNo == item.ItemNo &&
s1.WorkLine == item.WorkLine &&
s1.PbillNo == item.PbillNo &&
s1.ItemOutId == mesInvItemOuts.Id &&
@@ -431,7 +429,7 @@
(b, bar, c, d) => new
JoinQueryInfos(
JoinType.Left, b.ItemBarcode == bar.ItemBarcode,
- JoinType.Left, b.ItemId == c.Id &&
+ JoinType.Left, b.ItemNo == c.ItemNo &&
b.Company == c.Company &&
b.Factory == c.Factory,
JoinType.Left, b.DepotCode == d.DepotCode &&
@@ -465,16 +463,16 @@
NVL(s1.RK_QTY, 0) - NVL(KT_QTY, 0) KT_QTY,
R.DEPOT_SECTION_CODE, S.ITEM_MODEL, S.ITEM_NAME,
K.CGB014, Q.STAFF_NAME, R.DEPOT_CODE
- FROM MES_INV_ITEM_OUT_ITEMS C JOIN MES_ITEMS S ON C.ITEM_ID = S.ID
- LEFT JOIN (SELECT SUM(QUANTITY) KT_QTY, ITEM_NO,ITEM_ID, PBILL_NO, WORK_LINE, RK_NO
+ FROM MES_INV_ITEM_OUT_ITEMS C JOIN MES_ITEMS S ON C.ITEM_NO = S.ITEM_NO
+ LEFT JOIN (SELECT SUM(QUANTITY) KT_QTY, ITEM_NO, PBILL_NO, WORK_LINE, RK_NO
FROM MES_INV_ITEM_OUT_ITEMS
- GROUP BY ITEM_NO,ITEM_ID, PBILL_NO, WORK_LINE, RK_NO) U
- ON U.ITEM_ID = C.ITEM_ID AND U.WORK_LINE = C.WORK_LINE
+ GROUP BY ITEM_NO, PBILL_NO, WORK_LINE, RK_NO) U
+ ON U.ITEM_NO = C.ITEM_NO AND U.WORK_LINE = C.WORK_LINE
AND U.PBILL_NO = C.PBILL_NO AND U.RK_NO = C.RK_NO
- LEFT JOIN (SELECT SUM(QUANTITY) RK_QTY, ITEM_NO,ITEM_ID, EBELN, WORK_LINE, BILL_NO
+ LEFT JOIN (SELECT SUM(QUANTITY) RK_QTY, ITEM_NO, EBELN, WORK_LINE, BILL_NO
FROM mes_inv_item_in_c_details
- GROUP BY ITEM_NO,ITEM_ID, EBELN, WORK_LINE, BILL_NO) s1
- ON S1.ITEM_ID = C.ITEM_ID AND S1.WORK_LINE = C.WORK_LINE
+ GROUP BY ITEM_NO, EBELN, WORK_LINE, BILL_NO) s1
+ ON S1.ITEM_NO = C.ITEM_NO AND S1.WORK_LINE = C.WORK_LINE
AND S1.EBELN = C.PBILL_NO AND S1.BILL_NO = C.RK_NO
LEFT JOIN MES_ROH_IN_DATA K
ON K.BILL_NO = C.PBILL_NO AND C.WORK_LINE = K.PURCHASE_ORDER_LINE_NUMBER
@@ -482,10 +480,10 @@
left join MES_STAFF Q on H.PURCHASER = Q.STAFF_NAME
LEFT JOIN MES_SUPPLIER T ON H.SUPPLIER = T.ID
LEFT JOIN (select *
- from (SELECT row_number() over (partition by DEPOT_CODE,ITEM_ID, EBELN order by CREATE_DATE) rn, DEPOT_CODE, DEPOT_SECTION_CODE,ITEM_ID
+ from (SELECT row_number() over (partition by DEPOT_CODE, ITEM_NO, EBELN order by CREATE_DATE) rn, DEPOT_CODE, DEPOT_SECTION_CODE, ITEM_NO,
EBELN FROM mes_inv_item_in_c_details
where EBELN is not null)
- where rn = 1 and ROWNUM = 1) R ON R.ITEM_ID = C.ITEM_ID) where 1=1 {0}",
+ where rn = 1 and ROWNUM = 1) R ON R.ITEM_NO = C.ITEM_NO) where 1=1 {0}",
where);
var results = Db.Ado.SqlQuery<MESInvItemOutItems>(sql);
return results;
@@ -501,13 +499,13 @@
FROM (SELECT f_get_section_code2('1000', '1000', b.ITEM_NO,'{0}') DEPOT,
B.ITEM_NO, A.ITEM_MODEL,A.ITEM_NAME,to_char(nvl(b.QUANTITY, 0) - nvl(D.QUANTITY_OK, 0),'FM9999999990.00') QTY
FROM MES_INV_ITEM_OUT_ITEMS B LEFT JOIN mes_ITEMS A
- ON B.ITEM_ID = A.ID LEFT JOIN (SELECT ITEM_OUT_ID,
- ITEM_NO,ITEM_ID,PBILL_NO,SUM(QUANTITY) QUANTITY_OK,RK_NO
+ ON B.ITEM_NO = A.ITEM_NO LEFT JOIN (SELECT ITEM_OUT_ID,
+ ITEM_NO,PBILL_NO,SUM(QUANTITY) QUANTITY_OK,RK_NO
FROM MES_INV_ITEM_OUT_C_DETAILS
WHERE ITEM_OUT_ID = {1}
- GROUP BY ITEM_OUT_ID,ITEM_NO,ITEM_ID,PBILL_NO,RK_NO) D
+ GROUP BY ITEM_OUT_ID,ITEM_NO,PBILL_NO,RK_NO) D
ON D.ITEM_OUT_ID = B.ITEM_OUT_ID
- AND D.ITEM_ID = B.ITEM_ID
+ AND D.ITEM_NO = B.ITEM_NO
AND D.PBILL_NO = B.PBILL_NO
AND D.RK_NO = B.RK_NO
WHERE B.ITEM_OUT_ID = {1}
@@ -547,21 +545,21 @@
to_char(b.CREATE_DATE, 'yyyy-mm-dd') as CREATE_DATE
from mes_inv_item_in_c_details b
left join mes_inv_item_ins a on b.item_in_id = a.id
- LEFT JOIN (select s.item_no,s.item_id, s.work_line, s.Work_no,
+ LEFT JOIN (select s.item_no, s.work_line, s.Work_no,
sum(s.quantity) quantity, S.RK_NO
from mes_inv_item_out_c_details s
- group by s.item_no,s.item_id, s.work_line, s.work_no, S.RK_NO) s1
+ group by s.item_no, s.work_line, s.work_no, S.RK_NO) s1
ON NVL(B.work_LINE, '0') = NVL(s1.work_LINE, '0')
and B.work_no = s1.work_no
- and B.item_id = s1.item_id
+ and B.item_no = s1.item_no
AND B.BILL_NO = S1.RK_NO
- LEFT JOIN (SELECT SUM(QUANTITY) KT_QTY, ITEM_NO,ITEM_ID, PBILL_NO, WORK_LINE, RK_NO
+ LEFT JOIN (SELECT SUM(QUANTITY) KT_QTY, ITEM_NO, PBILL_NO, WORK_LINE, RK_NO
FROM MES_INV_ITEM_OUT_ITEMS
- GROUP BY ITEM_NO,ITEM_ID, PBILL_NO, WORK_LINE, RK_NO) U
- ON U.ITEM_ID = B.ITEM_ID
+ GROUP BY ITEM_NO, PBILL_NO, WORK_LINE, RK_NO) U
+ ON U.ITEM_NO = B.ITEM_NO
AND U.WORK_LINE = B.WORK_LINE
AND U.PBILL_NO = B.WORK_NO AND U.RK_NO = B.BILL_NO
- left join mes_items s2 on b.item_id = s2.id
+ left join mes_items s2 on b.item_no = s2.item_no
left join purdha da on da.dha001 = b.cbill_no
WHERE A.BILL_NO LIKE 'Q%'
AND A.CBILL_NO like 'L%'
diff --git a/MES.Service/service/Warehouse/OpeningReceiptServer.cs b/MES.Service/service/Warehouse/OpeningReceiptServer.cs
index f39711d..d525417 100644
--- a/MES.Service/service/Warehouse/OpeningReceiptServer.cs
+++ b/MES.Service/service/Warehouse/OpeningReceiptServer.cs
@@ -77,13 +77,13 @@
return entity;
}
- public MesInvItemIns GetMesInvItemIns(decimal? id)
+ public MesInvItemIns GetMesInvItemIns(decimal id)
{
return Db.Queryable<MesInvItemIns>()
.Where(s => s.Id == id).Single();
}
- public List<MesInvItemInCDetails> GetMesInvItemInCDetailsList(decimal? id)
+ public List<MesInvItemInCDetails> GetMesInvItemInCDetailsList(decimal id)
{
return Db.Queryable<MesInvItemInCDetails, MesUnit>((a, b) =>
new JoinQueryInfos(JoinType.Inner, a.Unit == b.Id.ToString()))
@@ -136,8 +136,7 @@
CbillNo = barcodeInfo.BillNo,
UrgentFlag = barcodeInfo.UrgentFlag,
BoardStyle = barcodeInfo.BoardStyle,
- TaskNo = barcodeInfo.TaskNo,
- ItemId = barcodeInfo.ItemId,
+ TaskNo = barcodeInfo.TaskNo
}).ExecuteCommand();
if (executeCommand <= 0) throw new Exception("鍐欏叆澶辫触");
@@ -245,8 +244,7 @@
BoardStyle = barcodeInfo.BoardStyle,
WorkNo = barcodeInfo.WorkNo,
WorkLine = barcodeInfo.WorkLine,
- SuppNo = barcodeInfo.SuppNo,
- ItemId = barcodeInfo.ItemId,
+ SuppNo = barcodeInfo.SuppNo
}).ExecuteCommand();
if (executeCommand <= 0) throw new Exception("鍐欏叆澶辫触");
@@ -279,8 +277,7 @@
BillNo = billNo,
WorkNo = barcodeInfo.WorkNo,
WorkLine = barcodeInfo.WorkLine,
- SuppNo = barcodeInfo.SuppNo,
- ItemId = barcodeInfo.ItemId,
+ SuppNo = barcodeInfo.SuppNo
}).ExecuteCommand();
if (executeCommand <= 0) throw new Exception("鍐欏叆澶辫触");
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 1e2727b..bdddbe0 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -23,7 +23,9 @@
{
var womErpCaa = wom.ErpCaa;
var mesWomcaa = MapErpCAAtoWomcaa(womErpCaa);
- var mesWomcabs =MapErpCABtoWomcab(wom.ErpCabs);
+ var mesWomcabs =
+ MapErpCABtoWomcab(wom.ErpCabs);
+
return UseTransaction(db =>
{
switch (womErpCaa.Type)
@@ -32,7 +34,6 @@
return UpdateData(db, mesWomcaa, mesWomcabs) ? 1 : 0;
case "2":
case "4":
- case "5":
return SaveOrUpdateData(db, mesWomcaa, mesWomcabs)
? 1
: 0;
@@ -47,9 +48,11 @@
List<Womcab> mesWomcabs)
{
if (mesWomcaa.Id != null) base.DeleteById(mesWomcaa.Id);
+
if (mesWomcabs.Count > 0)
db.Deleteable<Womcab>()
.Where(s => s.Eid == mesWomcaa.Erpid).ExecuteCommand();
+
var orUpdate = base.Insert(mesWomcaa);
var baOrUpdate = _womcabManager.InsertRange(mesWomcabs);
if (orUpdate && baOrUpdate) return true;
@@ -75,7 +78,9 @@
{
Erpid = Convert.ToDecimal(dto.Id),
Caa001 = dto.FBillNo,
- Caa021 = dto.FWorkShopID,
+ Caa021 = dto.FWorkShopID0,
+ RoutingId = dto.FRoutingId,
+ WorkShopId = dto.FREMWorkShopId,
DepotCode = dto.FStockId,
CreateDate = dto.FDate,
Caa004 = dto.FBillType,
@@ -95,6 +100,7 @@
Mtono = dto.FMTONO,
Lot = dto.FLot,
Caa013 = dto.FBomId,
+ Caa015 = dto.F_UNW_Text_xsddh,
CreateType = dto.FCreateType,
SrcBillType = dto.FSrcBillType,
SrcBillNo = dto.FSrcBillNo,
@@ -104,10 +110,10 @@
ForceCloserid = dto.FForceCloserId,
CloseType = dto.FCloseType,
SrcSplitBillno = dto.FSrcSplitBillNo,
- Caa016 = dto.FDESCRIPTION,
- Caa018 = Convert.ToDecimal(dto.PLAN_ID),
- Caa019 = Convert.ToDecimal(dto.PLAN_SEQ),
- Caa020 = dto.PLAN_NUM
+ Caa016 = dto.FMemoItem,
+ Caa018 = Convert.ToDecimal(dto.planId),
+ Caa019 = Convert.ToDecimal(dto.planSeq),
+ Caa020 = dto.planNum
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
@@ -124,12 +130,12 @@
{
var womcab = new Womcab
{
- Erpid = Convert.ToDecimal(dto.FENTRYID),
+ Erpid = Convert.ToDecimal(dto.ID),
Cab001 = dto.FBillNo,
Cab002 = dto.FSeq,
- Cab003 = dto.FMaterialID,
- Cab006 = !string.IsNullOrEmpty(dto.FNeedQty)
- ? Convert.ToDecimal(dto.FNeedQty)
+ Cab003 = dto.FMaterialID2,
+ Cab006 = !string.IsNullOrEmpty(dto.FNeedQty2)
+ ? Convert.ToDecimal(dto.FNeedQty2)
: null,
Cab007 = !string.IsNullOrEmpty(dto.FPickedQty)
? Convert.ToDecimal(dto.FPickedQty)
@@ -140,6 +146,7 @@
Lot = dto.FLot,
DepotCode = dto.FStockID,
IssueType = dto.FIssueType,
+ Cab008 = dto.F_UNW_Text_tpgy,
Cab009 = dto.FUnitID,
SupplyType = dto.FSupplyType,
Cab012 = !string.IsNullOrEmpty(dto.FStdQty)
@@ -148,7 +155,9 @@
Cab014 = dto.FIsKeyItem,
Numerator = dto.FNumerator,
Denominator = dto.FDenominator,
- Eid = Convert.ToDecimal(dto.FID)
+ Eid = Convert.ToDecimal(dto.PID),
+ SCRAPQTY = Convert.ToDecimal(dto.FFixScrapQty),
+ SCRAPRATE = Convert.ToDecimal(dto.FScrapRate)
};
var entity = Db.Queryable<Womcab>()
diff --git a/MESApplication/Controllers/BasicData/OrganizeController.cs b/MESApplication/Controllers/BasicData/OrganizeController.cs
deleted file mode 100644
index 9496ffa..0000000
--- a/MESApplication/Controllers/BasicData/OrganizeController.cs
+++ /dev/null
@@ -1,266 +0,0 @@
-锘縰sing Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Dynamic;
-using MES.Service.Modes;
-using MES.Service.service;
-using MES.Service.util;
-using MES.Service.Dto.webApi;
-using MES.Service.service.BasicData;
-using Newtonsoft.Json;
-
-namespace MESApplication.Controllers
-{
- [ApiController]
- [Route("api/[controller]")]
- public class OrganizeController : ControllerBase
- {
- private readonly MessageCenterManager _manager = new();
-
- private readonly OrganizeManager m = new();
-
- private readonly string METHOD = "POST";
-
- private readonly string TableName = "Organize";
-
- private readonly string URL = "http://localhost:10054/api/Organize/";
-
- [HttpPost("Save")]
- public ResponseResult Save(ErpOrganize unit)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "Save";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(unit);
- entity.Status = 1;
- entity.CreateBy = "PL017";
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var save = m.Save(unit);
- resultInfos.tbBillList = save;
-
- entity.Result = 0;
- if (save) entity.Result = 1;
-
- entity.DealWith = 1;
- _manager.save(entity);
-
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- entity.Result = 0;
-
- entity.DealWith = 0;
-
- entity.ResultData = ex.Message;
-
- _manager.save(entity);
-
- return ResponseResult.ResponseError(ex);
- }
- }
-
- [HttpPost("SaveList")]
- public ResponseResult SaveList(List<ErpOrganize> units)
- {
- var entity = new MessageCenter();
- entity.TableName = TableName;
- entity.Url = URL + "SaveList";
- entity.Method = METHOD;
- entity.Data = JsonConvert.SerializeObject(units);
- entity.Status = 1;
- entity.CreateBy = "PL017";
- try
- {
- dynamic resultInfos = new ExpandoObject();
- var save = m.SaveList(units);
- resultInfos.tbBillList = save;
-
- entity.Result = 0;
- if (save) entity.Result = 1;
-
- entity.DealWith = 1;
- _manager.save(entity);
-
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- entity.Result = 0;
-
- entity.DealWith = 0;
-
- entity.ResultData = ex.Message;
-
- _manager.save(entity);
-
- return ResponseResult.ResponseError(ex);
- }
- }
- // private OrganizeManager m = new OrganizeManager();
-
-
- /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
-
- /// <summary>
- /// 鑾峰彇鎵�鏈�
- /// </summary>
- /// <returns></returns>
- [HttpPost("GetList")]
- public ResponseResult GetList()
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetList();
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
-
- /// <summary>
- /// 鏍规嵁涓婚敭鑾峰彇
- /// </summary>
- /// <returns></returns>
- [HttpPost("GetById")]
- public ResponseResult GetById(int id)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetById(id);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 鏍规嵁涓婚敭鍒犻櫎
- /// </summary>
- /// <returns></returns>
- [HttpPost("DeleteByIds")]
- public ResponseResult DeleteByIds([FromBody] object[] ids)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.DeleteByIds(ids);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 娣诲姞
- /// </summary>
- /// <returns></returns>
- [HttpPost("Insert")]
- public ResponseResult Add([FromBody] Organize data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Insert(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
- /// <summary>
- /// 娣诲姞杩斿洖鑷
- /// </summary>
- /// <returns></returns>
- [HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] Organize data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.InsertReturnIdentity(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /// <summary>
- /// 淇敼
- /// </summary>
- /// <returns></returns>
- [HttpPost("Update")]
- public ResponseResult Update([FromBody] Organize data)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.Update(data);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
- }
-}
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index 017d8ba..1fc62c1 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 41774a5..d303498 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 0c51114..79ed70b 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 04d4f5f..a4b110e 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 96fc1ae..b457c4a 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.xml b/MESApplication/bin/Debug/net8.0/MESApplication.xml
index 57c4b2f..f07d581 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.xml
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.xml
@@ -678,42 +678,6 @@
</summary>
<returns></returns>
</member>
- <member name="M:MESApplication.Controllers.OrganizeController.GetList">
- <summary>
- 鑾峰彇鎵�鏈�
- </summary>
- <returns></returns>
- </member>
- <member name="M:MESApplication.Controllers.OrganizeController.GetById(System.Int32)">
- <summary>
- 鏍规嵁涓婚敭鑾峰彇
- </summary>
- <returns></returns>
- </member>
- <member name="M:MESApplication.Controllers.OrganizeController.DeleteByIds(System.Object[])">
- <summary>
- 鏍规嵁涓婚敭鍒犻櫎
- </summary>
- <returns></returns>
- </member>
- <member name="M:MESApplication.Controllers.OrganizeController.Add(MES.Service.Modes.Organize)">
- <summary>
- 娣诲姞
- </summary>
- <returns></returns>
- </member>
- <member name="M:MESApplication.Controllers.OrganizeController.InsertReturnIdentity(MES.Service.Modes.Organize)">
- <summary>
- 娣诲姞杩斿洖鑷
- </summary>
- <returns></returns>
- </member>
- <member name="M:MESApplication.Controllers.OrganizeController.Update(MES.Service.Modes.Organize)">
- <summary>
- 淇敼
- </summary>
- <returns></returns>
- </member>
<member name="M:MESApplication.Controllers.QC.MesLineUserController.GetList">
<summary>
鑾峰彇鎵�鏈�
--
Gitblit v1.9.3