From 459d4a2b2bd5390a5d02947e75a934207fb9ad0c Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 24 三月 2025 17:08:39 +0800
Subject: [PATCH] 更新U9实体，新增业务实体
---
Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER_SN.cs | 150 +++-
Tiger.Business.MES/iERP/U9C_MES.cs | 1
Tiger.Business.WMS/Task/ERP/Jobs.ReceiptHToErpJob.cs | 9
Tiger.Business.WMS/T100ToWMS/MaterialInfoBusiness.cs | 112 +-
Tiger.Model.Net/Entitys/WMS/BIZ_ITEM_CVT_SN.cs | 136 ++++
Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_DTL.cs | 21
Tiger.Model.Net/Entitys/BAS/BAS_ITEM.cs | 308 ++++----
Tiger.Model.Net/Entitys/WMS/BIZ_U9_SCM_OUT_DTL.cs | 161 ++++
Tiger.Business.WMS/Transaction/Old/OutTransfer.cs | 74 +-
Tiger.Model.Net/Entitys/WMS/BIZ_U9_SCM_OUT.cs | 167 ++++
Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_SN.cs | 51 -
Tiger.Model.Net/Entitys/WMS/BIZ_ITEM_CVT_DTL.cs | 161 ++++
Tiger.Business.WMS/Transaction/Old/ProductionMaterialReq.cs | 55
Tiger.Business.WMS/Transaction/Old/OutWorkOrder.cs | 55
Tiger.Business.WMS/iWMS/ProdMaterialReq.cs | 20
Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs | 2
Tiger.Business.WMS/T100ToWMS/TrasferInfoBusiness.cs | 26
Tiger.Business.WMS/Transaction/Old/InProductionReturn.cs | 30
Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER.cs | 176 ++---
Tiger.Model.Net/Entitys/MES/YadaU9/mes_ItemMaster.cs | 4
Tiger.Business.WMS/T100ToWMS/ProductInputBusiness.cs | 6
Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER_DTL.cs | 114 +-
Tiger.Business.WMS/Transaction/Old/OutSplit.cs | 2
Tiger.Model.Net/Entitys/WMS/BIZ_ITEM_CVT.cs | 145 ++++
24 files changed, 1,402 insertions(+), 584 deletions(-)
diff --git a/Tiger.Business.MES/iERP/U9C_MES.cs b/Tiger.Business.MES/iERP/U9C_MES.cs
index 318ccf2..21d54c8 100644
--- a/Tiger.Business.MES/iERP/U9C_MES.cs
+++ b/Tiger.Business.MES/iERP/U9C_MES.cs
@@ -65,6 +65,7 @@
AUTH_ORG = orgs.Where(x => x.ID == orgId).Select(q => q.ORG_CODE).FirstOrDefault(),
CUST_PROD_CODE = di["CustomerItem"] == null ? "" : di["CustomerItem"].ToString(),
RULE_CODE = di["BarRule"] == null ? "" : di["BarRule"].ToString(),
+ DEFAULT_LOCATION = di["BinCode"] == null ? "" : di["BinCode"].ToString(),
};
items.Add(basItem);
var extInfo = new BAS_ITEM_EXT()
diff --git a/Tiger.Business.WMS/T100ToWMS/MaterialInfoBusiness.cs b/Tiger.Business.WMS/T100ToWMS/MaterialInfoBusiness.cs
index 86a5894..4b9dd4d 100644
--- a/Tiger.Business.WMS/T100ToWMS/MaterialInfoBusiness.cs
+++ b/Tiger.Business.WMS/T100ToWMS/MaterialInfoBusiness.cs
@@ -269,7 +269,7 @@
public int GetOtherOutInfoToT100(InputDTO input)
{
var DB = Biz.Db;
- var dataList = DB.Queryable<BIZ_ERP_OTH_OUT>().Where(i => i.STATUS == BIZ_WMS_TRANSFER.STATUSs.COMPLETE.GetValue() && string.IsNullOrWhiteSpace(i.ERP_BILL_CODE) && i.AUTH_ORG == input.site).ToList();
+ var dataList = DB.Queryable<BIZ_ERP_OTH_OUT>().Where(i => i.STATUS == BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue() && string.IsNullOrWhiteSpace(i.ERP_BILL_CODE) && i.AUTH_ORG == input.site).ToList();
Logger.Scheduler.Info("鍏朵粬鍑哄簱鍗曚俊鎭紑濮嬫帹閫併�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
if (!dataList.Any())
@@ -363,7 +363,7 @@
public int PutSaleOutInfoToT100(InputDTO input)
{
var DB = Biz.Db;
- var dataList = DB.Queryable<BIZ_ERP_SALE_OUT>().Where(i => i.STATUS == BIZ_WMS_TRANSFER.STATUSs.COMPLETE.GetValue() && string.IsNullOrWhiteSpace(i.ERP_BILL_CODE) && i.AUTH_ORG == input.site).ToList();// 鑾峰彇绗﹀悎鏉′欢鐨勯攢鍞嚭搴撳崟鏁版嵁
+ var dataList = DB.Queryable<BIZ_ERP_SALE_OUT>().Where(i => i.STATUS == BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue() && string.IsNullOrWhiteSpace(i.ERP_BILL_CODE) && i.AUTH_ORG == input.site).ToList();// 鑾峰彇绗﹀悎鏉′欢鐨勯攢鍞嚭搴撳崟鏁版嵁
Logger.Scheduler.Info("閿�鍞嚭搴撳崟淇℃伅寮�濮嬫帹閫併�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
if (!dataList.Any())
@@ -484,7 +484,7 @@
//}
var dataList = DB.Queryable<BIZ_WMS_TRANSFER>().
- Where(i => i.STATUS == BIZ_WMS_TRANSFER.STATUSs.FINISHED.GetValue() && string.IsNullOrWhiteSpace(i.ERP_BILL_CODE) && i.AUTH_ORG == input.site)
+ Where(i => i.STATUS == BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue() && string.IsNullOrWhiteSpace(i.ERP_ORDER) && i.AUTH_ORG == input.site)
.ToList();
Logger.Scheduler.Info("璋冩嫧鍗曚俊鎭紑濮嬫帹閫併�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
@@ -494,29 +494,29 @@
return 0;
}
- var billcodeLst = dataList.Select(i => i.BILLCODE).Distinct().ToList();
+ var billcodeLst = dataList.Select(i => i.ORDER_NO).Distinct().ToList();
- var detailData = DB.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(i => billcodeLst.Contains(i.BILLCODE)).ToList();// 鑾峰彇鏄庣粏鏁版嵁
+ var detailData = DB.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(i => billcodeLst.Contains(i.ORDER_NO)).ToList();// 鑾峰彇鏄庣粏鏁版嵁
var returnData = DB.Queryable<BIZ_ERP_PROD_RETURN>().Where(i => billcodeLst.Contains(i.BILLCODE)).ToList();// 鑾峰彇閫�鏂欒〃澶存暟鎹�
var returnDetailData = DB.Queryable<BIZ_ERP_PROD_RETURN_DTL>().Where(i => billcodeLst.Contains(i.BILLCODE)).ToList();// 鑾峰彇閫�鏂欒〃澶存暟鎹�
Logger.Scheduler.Info("璋冩嫧鍗曚俊鎭紑濮嬫帹閫併�傘�傘��");
foreach (var data in dataList)
{
- var detailLst = detailData.Where(i => i.BILLCODE == data.BILLCODE).ToList();
+ var detailLst = detailData.Where(i => i.ORDER_NO == data.ORDER_NO).ToList();
var details = new List<TrasferDetailDTO>();
foreach (var detail in detailLst)
{
details.Add(new TrasferDetailDTO()
{
- indd101 = detail.SOURCECODE,
- inddseq = detail.BILLLINE,
+ indd101 = detail.SOURCE_ORDER,
+ inddseq = detail.ORDER_LINE,
indd002 = detail.ITEM_CODE,
- indd022 = detail.OUTWAREHOUSECODE,
+ indd022 = detail.OUT_WH_CODE,
indd023 = "",
- indd024 = detail.BATCH_NO_IN,
- indd103 = detail.OUTQTY.ToString(),
- indd032 = detail.INWAREHOUSECODE,
+ indd024 = detail.IN_LOTNO,
+ indd103 = detail.QTY_OUT.ToString(),
+ indd032 = detail.IN_WH_CODE,
indd033 = ""
});
}
@@ -541,7 +541,7 @@
indcdocno = "1201",
indcdocdt = DateTime.Now.ToString("yyyy/MM/dd"),
indc004 = "L16225", //detailLst[0].CREATE_USER,
- indc008 = data.SOURCECODE,
+ indc008 = data.SOURCE_ORDER,
detail = details
}
}
@@ -617,15 +617,15 @@
#endregion 鍙戣捣璇锋眰
- var res = returnData.Where(i => i.BILLCODE == data.BILLCODE).FirstOrDefault();
- var retuendetailData = returnDetailData.Where(i => i.BILLCODE == data.BILLCODE).ToList();
+ var res = returnData.Where(i => i.BILLCODE == data.ORDER_NO).FirstOrDefault();
+ var retuendetailData = returnDetailData.Where(i => i.BILLCODE == data.ORDER_NO).ToList();
if (!string.IsNullOrWhiteSpace(result.payload.std_data?.parameter?.docno))
{
- data.ERP_BILL_CODE = result.payload.std_data?.parameter?.docno;// 鏇存柊鍗曞彿
+ data.ERP_ORDER = result.payload.std_data?.parameter?.docno;// 鏇存柊鍗曞彿
foreach (var item in detailLst)
{
- item.ERP_BILL_CODE = result.payload.std_data?.parameter?.docno;
+ item.ERP_ORDER = result.payload.std_data?.parameter?.docno;
}
DB.Updateable(detailLst).ExecuteCommand();
@@ -641,11 +641,11 @@
DB.Updateable(res).ExecuteCommand();// 鏁版嵁鏇存柊
}
}
- if (result.payload.std_data?.execution.code == "S" && string.IsNullOrWhiteSpace(data.ERP_BILL_CODE))
+ if (result.payload.std_data?.execution.code == "S" && string.IsNullOrWhiteSpace(data.ERP_ORDER))
{
- data.ERP_BILL_CODE = "T100杩斿洖淇℃伅宸茶繃璐�";// 鏇存柊鍗曞彿
+ data.ERP_ORDER = "T100杩斿洖淇℃伅宸茶繃璐�";// 鏇存柊鍗曞彿
}
- Logger.Scheduler.Info($"璋冩嫧鍗曞彿: {data.BILLCODE}锛孴100杩斿洖鍗曞彿: {result.payload.std_data?.parameter?.docno}");
+ Logger.Scheduler.Info($"璋冩嫧鍗曞彿: {data.ORDER_NO}锛孴100杩斿洖鍗曞彿: {result.payload.std_data?.parameter?.docno}");
DB.Updateable(data).ExecuteCommand();// 鏁版嵁鏇存柊
}
Logger.Scheduler.Info("璋冩嫧鍗曚俊鎭帹閫佸畬鎴�");
@@ -668,7 +668,7 @@
public int GetTrasferInfoToT100Plan2(InputDTO input)
{
var DB = Biz.Db;
- var dataList = DB.Queryable<BIZ_WMS_TRANSFER>().Where(i => i.STATUS == BIZ_WMS_TRANSFER.STATUSs.COMPLETE.GetValue() && string.IsNullOrWhiteSpace(i.ERP_BILL_CODE) && i.AUTH_ORG == input.site).ToList();
+ var dataList = DB.Queryable<BIZ_WMS_TRANSFER>().Where(i => i.STATUS == BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue() && string.IsNullOrWhiteSpace(i.ERP_ORDER) && i.AUTH_ORG == input.site).ToList();
Logger.Scheduler.Info("鐩存帴杩囪处璋冩嫧鍗曚俊鎭紑濮嬫帹閫併�傘�傘�傛暟鎹鏌ヨ繘琛屼腑銆傘�傘��");
if (!dataList.Any())
@@ -677,20 +677,20 @@
return 0;
}
- var billcodeLst = dataList.Select(i => i.BILLCODE).Distinct().ToList();
- var detailData = DB.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(i => billcodeLst.Contains(i.BILLCODE)).ToList();// 鑾峰彇鏄庣粏鏁版嵁
+ var billcodeLst = dataList.Select(i => i.ORDER_NO).Distinct().ToList();
+ var detailData = DB.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(i => billcodeLst.Contains(i.ORDER_NO)).ToList();// 鑾峰彇鏄庣粏鏁版嵁
Logger.Scheduler.Info("璋冩嫧鍗曚俊鎭紑濮嬫帹閫併�傘�傘��");
foreach (var data in dataList)
{
- var detailLst = detailData.Where(i => i.BILLCODE == data.BILLCODE).ToList();
+ var detailLst = detailData.Where(i => i.ORDER_NO == data.ORDER_NO).ToList();
var details = new List<TrasferDetailDTO>();
foreach (var detail in detailLst)
{
details.Add(new TrasferDetailDTO()
{
- inddseq = detail.BILLLINE,
- indd103 = detail.OUTQTY.ToString(),
+ inddseq = detail.ORDER_LINE,
+ indd103 = detail.QTY_OUT.ToString(),
});
}
@@ -711,7 +711,7 @@
{
parameter = new ParameterTrasferInfoDTO()
{
- indcdocno = data.BILLCODE,
+ indcdocno = data.ORDER_NO,
indc022 = DateTime.Now.ToString("yyyy/MM/dd"),
detail = details
}
@@ -729,7 +729,7 @@
var requestJson = JsonConvert.SerializeObject(model);
var response = HttpHelper.PostAsync(t100Url, requestJson).Result;
result = JsonConvert.DeserializeObject<T100ActionResult<resultStd_data<ParameterTransferInfoT100>>>(response.Message);
- Logger.Scheduler.Info($"璋冩嫧鍗曡繃璐︽彁浜son: {requestJson}锛岃皟鎷ㄥ崟鍙凤細{data.BILLCODE}锛岃繑鍥濲son: {response.Message}");
+ Logger.Scheduler.Info($"璋冩嫧鍗曡繃璐︽彁浜son: {requestJson}锛岃皟鎷ㄥ崟鍙凤細{data.ORDER_NO}锛岃繑鍥濲son: {response.Message}");
}
catch (Exception ex)
{
@@ -743,14 +743,14 @@
if (!string.IsNullOrWhiteSpace(result.payload.std_data?.parameter?.docno))
{
Result = result.payload.std_data?.parameter?.docno;
- data.ERP_BILL_CODE = result.payload.std_data?.parameter?.docno;// 鏇存柊鍗曞彿
- Logger.Scheduler.Info($"璋冩嫧鍗曞彿锛歿data.BILLCODE}瀵瑰簲鐨凾100杩斿洖鍗曞彿锛歿result.payload.std_data?.parameter?.docno}宸叉洿鏂�");
+ data.ERP_ORDER = result.payload.std_data?.parameter?.docno;// 鏇存柊鍗曞彿
+ Logger.Scheduler.Info($"璋冩嫧鍗曞彿锛歿data.ORDER_NO}瀵瑰簲鐨凾100杩斿洖鍗曞彿锛歿result.payload.std_data?.parameter?.docno}宸叉洿鏂�");
}
- if (result.payload.std_data?.execution.code == "S" && string.IsNullOrWhiteSpace(data.ERP_BILL_CODE))
+ if (result.payload.std_data?.execution.code == "S" && string.IsNullOrWhiteSpace(data.ERP_ORDER))
{
- data.ERP_BILL_CODE = "T100杩斿洖淇℃伅宸茶繃璐�";
+ data.ERP_ORDER = "T100杩斿洖淇℃伅宸茶繃璐�";
Result = "T100杩斿洖淇℃伅宸茶繃璐�";
- Logger.Scheduler.Info($"璋冩嫧鍗曞彿锛歿data.BILLCODE}瀵瑰簲鐨凾100杩斿洖淇℃伅锛歿"T100杩斿洖淇℃伅宸茶繃璐�"}宸叉洿鏂�");
+ Logger.Scheduler.Info($"璋冩嫧鍗曞彿锛歿data.ORDER_NO}瀵瑰簲鐨凾100杩斿洖淇℃伅锛歿"T100杩斿洖淇℃伅宸茶繃璐�"}宸叉洿鏂�");
}
if (!string.IsNullOrWhiteSpace(Result))
{
@@ -859,8 +859,8 @@
{
ID = Guid.NewGuid().ToString("N"),
AUTH_ORG = input.site,
- BILLCODE = item.indcdocno,
- BILLDATE = item.indcdocdt.ToDateTime(),
+ ORDER_NO = item.indcdocno,
+ ORDER_DATE = item.indcdocdt.ToDateTime(),
CREATE_USER = "T100-" + item.indc004
};
@@ -895,17 +895,17 @@
{
detailData.Add(new BIZ_WMS_TRANSFER_DTL()
{
- BILLCODE = ser.indddocno,
- BILLLINE = ser.inddseq.ToString(),
+ ORDER_NO = ser.indddocno,
+ ORDER_LINE = ser.inddseq.ToString(),
ITEM_CODE = ser.indd002,
- UNITCODE = ser.indd006,
- PRQTY = ser.indd103,
+ UNIT = ser.indd006,
+ QTY_REQ = ser.indd103,
AUTH_ORG = input.site,
- OUTWAREHOUSECODE = ser.indd022,
- INWAREHOUSECODE = ser.indd032
+ OUT_WH_CODE = ser.indd022,
+ IN_WH_CODE = ser.indd032
});
- transferData.INWAREHOUSECODE = ser.indd032;
- transferData.OUTWAREHOUSECODE = ser.indd022;
+ transferData.IN_WH_CODE = ser.indd032;
+ transferData.OUT_WH_CODE = ser.indd022;
}
}
@@ -920,31 +920,31 @@
foreach (var item in masterData)
{
- var detaildatas = detailData.Where(i => i.BILLCODE == item.BILLCODE).ToList();
+ var detaildatas = detailData.Where(i => i.ORDER_NO == item.ORDER_NO).ToList();
var detaildto = new List<TrasferInfoDetailDTO>();
foreach (var detailitem in detaildatas)
{
detaildto.Add(new TrasferInfoDetailDTO()
{
- BILLCODE = detailitem.BILLCODE,
- BILLLINE = Convert.ToInt32(detailitem.BILLLINE),
- LINESTATUS = detailitem.LINESTATUS.ToString(),
- OUTQTY = detailitem.OUTQTY,
+ BILLCODE = detailitem.ORDER_NO,
+ BILLLINE = Convert.ToInt32(detailitem.ORDER_LINE),
+ LINESTATUS = detailitem.STATUS.ToString(),
+ OUTQTY = detailitem.QTY_OUT,
ITEM_CODE = detailitem.ITEM_CODE,
- UNITCODE = detailitem.UNITCODE,
- PRQTY = detailitem.PRQTY,
- OUTWAREHOUSECODE = detailitem.OUTWAREHOUSECODE,
- INWAREHOUSECODE = detailitem.INWAREHOUSECODE,
+ UNITCODE = detailitem.UNIT,
+ PRQTY = detailitem.QTY_REQ,
+ OUTWAREHOUSECODE = detailitem.OUT_WH_CODE,
+ INWAREHOUSECODE = detailitem.IN_WH_CODE,
CREATE_TIME = DateTime.Now
});
}
inputdto.Add(new TrasferInfoDTO()
{
AUTH_ORG = input.site,
- BILLCODE = item.BILLCODE,
- BILLDATE = item.BILLDATE,
- OUTWAREHOUSECODE = item.OUTWAREHOUSECODE,
- INWAREHOUSECODE = item.INWAREHOUSECODE,
+ BILLCODE = item.ORDER_NO,
+ BILLDATE = item.ORDER_DATE,
+ OUTWAREHOUSECODE = item.OUT_WH_CODE,
+ INWAREHOUSECODE = item.IN_WH_CODE,
CREATE_TIME = item.CREATE_TIME,
details = detaildto
});
diff --git a/Tiger.Business.WMS/T100ToWMS/ProductInputBusiness.cs b/Tiger.Business.WMS/T100ToWMS/ProductInputBusiness.cs
index 5546b7f..e8b4682 100644
--- a/Tiger.Business.WMS/T100ToWMS/ProductInputBusiness.cs
+++ b/Tiger.Business.WMS/T100ToWMS/ProductInputBusiness.cs
@@ -109,12 +109,12 @@
snLst.Add(new BIZ_WMS_TRANSFER_SN()
{
AUTH_ORG = warehouse.OrgCode,
- BILLCODE = input.BillCode,
+ ORDER_NO = input.BillCode,
SN = item.SN,
STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
ITEM_CODE = snData.Where(i => i.SN == item.SN).FirstOrDefault()?.ITEM_CODE,
QTY = item.Qty,
- BILLLINE = dicitemcode[item.ItemCode]
+ ORDER_LINE = dicitemcode[item.ItemCode]
});
}
}
@@ -209,7 +209,7 @@
if (snLst.Any())
{
- var history = db.Queryable<BIZ_WMS_TRANSFER_SN>().Where(i => i.BILLCODE == input.BillCode).ToList();
+ var history = db.Queryable<BIZ_WMS_TRANSFER_SN>().Where(i => i.ORDER_NO == input.BillCode).ToList();
if (history.Any())
{
db.Deleteable(history).ExecuteCommand();
diff --git a/Tiger.Business.WMS/T100ToWMS/TrasferInfoBusiness.cs b/Tiger.Business.WMS/T100ToWMS/TrasferInfoBusiness.cs
index 68979a0..2174396 100644
--- a/Tiger.Business.WMS/T100ToWMS/TrasferInfoBusiness.cs
+++ b/Tiger.Business.WMS/T100ToWMS/TrasferInfoBusiness.cs
@@ -27,7 +27,7 @@
{
foreach (var item in masterData)
{
- item.SOURCECODE = item.BILLCODE;
+ item.SOURCE_ORDER = item.ORDER_NO;
}
}
var detailSource = new List<TrasferInfoDetailDTO>();
@@ -54,32 +54,32 @@
//var db = Biz.Db;// 鍖哄垎姝ｅ紡搴撹繕鏄祴璇曞簱
var db = Biz.DataSource["WMS57"].Client; // 鍖哄垎姝ｅ紡搴撹繕鏄祴璇曞簱
- var BILLCODELst = masterData.Select(i => i.BILLCODE).Distinct().ToList();
+ var BILLCODELst = masterData.Select(i => i.ORDER_NO).Distinct().ToList();
#region 鍖哄垎涓昏〃闇�瑕佹彃鍏ュ強鏇存柊鐨勬暟鎹�
- var hostoryMasterData = db.Queryable<BIZ_WMS_TRANSFER>().Where(i => BILLCODELst.Contains(i.BILLCODE)).ToList();// 鑾峰彇涓昏〃鏃ф暟鎹�
- var resMaster = hostoryMasterData.Select(i => i.BILLCODE).Distinct().ToList();
- var masterNeedInsert = masterData.Where(i => !resMaster.Contains(i.BILLCODE)).ToList();// 闇�瑕佹彃鍏ョ殑鏁版嵁
- var masterNeedUpdate = masterData.Where(i => resMaster.Contains(i.BILLCODE)).ToList();// 闇�瑕佹洿鏂扮殑鏁版嵁
+ var hostoryMasterData = db.Queryable<BIZ_WMS_TRANSFER>().Where(i => BILLCODELst.Contains(i.ORDER_NO)).ToList();// 鑾峰彇涓昏〃鏃ф暟鎹�
+ var resMaster = hostoryMasterData.Select(i => i.ORDER_NO).Distinct().ToList();
+ var masterNeedInsert = masterData.Where(i => !resMaster.Contains(i.ORDER_NO)).ToList();// 闇�瑕佹彃鍏ョ殑鏁版嵁
+ var masterNeedUpdate = masterData.Where(i => resMaster.Contains(i.ORDER_NO)).ToList();// 闇�瑕佹洿鏂扮殑鏁版嵁
foreach (var item in masterNeedUpdate)
{
- item.ID = hostoryMasterData.Where(i => i.BILLCODE == item.BILLCODE).FirstOrDefault()?.ID;
+ item.ID = hostoryMasterData.Where(i => i.ORDER_NO == item.ORDER_NO).FirstOrDefault()?.ID;
}
#endregion 鍖哄垎涓昏〃闇�瑕佹彃鍏ュ強鏇存柊鐨勬暟鎹�
#region 鍖哄垎鏄庣粏琛ㄩ渶瑕佹彃鍏ュ強鏇存柊鐨勬暟鎹�
- var hostoryDetailData = db.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(i => BILLCODELst.Contains(i.BILLCODE)).ToList();// 鑾峰彇鏄庣粏琛ㄦ棫鏁版嵁 鍓旈櫎鐘舵�佷负2鐨勬暟鎹�
+ var hostoryDetailData = db.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(i => BILLCODELst.Contains(i.ORDER_NO)).ToList();// 鑾峰彇鏄庣粏琛ㄦ棫鏁版嵁 鍓旈櫎鐘舵�佷负2鐨勬暟鎹�
var resDetail = hostoryDetailData.Select(i => i.ITEM_CODE).Distinct().ToList();// 鑾峰彇鎵�鏈夌殑鐗╂枡缂栧彿
- var ignoreCode = hostoryDetailData.Where(i => i.LINESTATUS == 2 || i.LINESTATUS == 3).Select(i => i.ITEM_CODE).Distinct().ToList();// 闇�瑕佸拷鐣ョ殑鐗╂枡缂栧彿
+ var ignoreCode = hostoryDetailData.Where(i => i.STATUS == 2 || i.STATUS == 3).Select(i => i.ITEM_CODE).Distinct().ToList();// 闇�瑕佸拷鐣ョ殑鐗╂枡缂栧彿
var needInsertData = detailData.Where(i => !resDetail.Contains(i.ITEM_CODE) && !ignoreCode.Contains(i.ITEM_CODE)).ToList();// 闇�瑕佹彃鍏ョ殑鏁版嵁
if (type == "1")
{
foreach (var item in needInsertData)
{
- item.OUTQTY = 0;
+ item.QTY_OUT = 0;
}
}
@@ -87,9 +87,9 @@
foreach (var item in needUpdateDetail)
{
- if (item.LINESTATUS == 0 && type == "1")
+ if (item.STATUS == 0 && type == "1")
{
- item.OUTQTY = 0;
+ item.QTY_OUT = 0;
}
item.AUTH_ORG = input[0].AUTH_ORG;
}
@@ -97,7 +97,7 @@
var exceptCode = detailData.Select(i => i.ITEM_CODE).Distinct().ToList();
var deletecode = resDetail.Except(exceptCode).ToList();
- var needDeleteData = hostoryDetailData.Where(i => deletecode.Contains(i.ITEM_CODE) && BILLCODELst.Contains(i.BILLCODE)).ToList();
+ var needDeleteData = hostoryDetailData.Where(i => deletecode.Contains(i.ITEM_CODE) && BILLCODELst.Contains(i.ORDER_NO)).ToList();
foreach (var item in needUpdateDetail)
{
diff --git a/Tiger.Business.WMS/Task/ERP/Jobs.ReceiptHToErpJob.cs b/Tiger.Business.WMS/Task/ERP/Jobs.ReceiptHToErpJob.cs
index 22c1a0e..7a2929f 100644
--- a/Tiger.Business.WMS/Task/ERP/Jobs.ReceiptHToErpJob.cs
+++ b/Tiger.Business.WMS/Task/ERP/Jobs.ReceiptHToErpJob.cs
@@ -133,6 +133,13 @@
// _materialInfoBusiness = materialInfoBusiness;
//}
+ public static List<string> strongHoldList = new List<string>
+ {
+ "XCSJ",
+ "DGXC",
+ "AHXC"
+ };
+
/// <summary>
/// 鍚屾鐗╂枡淇℃伅瀹氭椂浠诲姟
/// </summary>
@@ -145,7 +152,7 @@
try
{
Logger.Scheduler.Info(context.Trigger.ConvertToMonitor()); //璁″垝浠诲姟寮�濮嬫棩蹇�
- foreach (var item in BIZ_WMS_TRANSFER.strongHoldList)
+ foreach (var item in strongHoldList)
{
var model = new InputDTO()
{
diff --git a/Tiger.Business.WMS/Transaction/Old/InProductionReturn.cs b/Tiger.Business.WMS/Transaction/Old/InProductionReturn.cs
index 425ba4a..167efff 100644
--- a/Tiger.Business.WMS/Transaction/Old/InProductionReturn.cs
+++ b/Tiger.Business.WMS/Transaction/Old/InProductionReturn.cs
@@ -246,7 +246,7 @@
return action;
}
string billCode = barcodeScanneds?.BUSINESSCODE;
- string billCodeT = barcodeScannedsT?.BILLCODE;
+ string billCodeT = barcodeScannedsT?.ORDER_NO;
//string billLine = barcodeScanneds[0].BILLLINE;
foreach (var item in inv.Items)
@@ -321,41 +321,41 @@
}
Logger.Default.Info($"鏇存柊鍗曟嵁鏄庣粏淇℃伅:鍗曞彿[{billCode}]锛岄」娆{string.Join(",", billDetail.Select(q=>q.BILLLINE))}]锛屾暟閲廩{string.Join(",", billDetail.Select(q => q.INVENTORYQTY))}]锛岀姸鎬乕{string.Join(",", billDetail.Select(q => q.LINESTATUS))}]");
//璋冩嫧鍗�
- var billDetailT = Biz.Db.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(t => t.BILLCODE.ToUpper() == billCodeT.ToUpper() && t.ITEM_CODE == inv.ItemInfo.ITEM_CODE).ToList();
+ var billDetailT = Biz.Db.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(t => t.ORDER_NO.ToUpper() == billCodeT.ToUpper() && t.ITEM_CODE == inv.ItemInfo.ITEM_CODE).ToList();
foreach (var dtl in billDetailT)
{
- dtl.INWAREHOUSECODE = putOnInfo.Warehouse.WH_CODE;
+ dtl.IN_WH_CODE = putOnInfo.Warehouse.WH_CODE;
}
var totalT = Biz.Db.Queryable<BIZ_WMS_TRANSFER_SN>()
- .Where(t => t.BILLCODE.ToUpper() == billCodeT.ToUpper() && t.ITEM_CODE == inv.ItemInfo.ITEM_CODE)
+ .Where(t => t.ORDER_NO.ToUpper() == billCodeT.ToUpper() && t.ITEM_CODE == inv.ItemInfo.ITEM_CODE)
.Where(t => t.STATUS == WMS_ITEM.STATUSs.InStore.GetValue() || inv.Items.Select(q => q.SN).Contains(t.SN))
.Sum(x => x.QTY);
foreach (var dtl in billDetailT)
{
- dtl.INQTY = total;
- dtl.INVENTORYQTY = total;
+ dtl.QTY_IN = total;
+ //dtl.INVENTORYQTY = total;
if (dtl.ITEM_CODE == lotNo?.ITEM_CODE)
{
- dtl.BATCH_NO_IN = WarehouseName.Contains("瀹緵") ? lotNo.LOTNO : "";
- dtl.BATCH_NO_OUT = WarehouseName.Contains("瀹緵") ? lotNo.LOTNO : "";
+ dtl.IN_LOTNO = WarehouseName.Contains("瀹緵") ? lotNo.LOTNO : "";
+ dtl.OUT_LOTNO = WarehouseName.Contains("瀹緵") ? lotNo.LOTNO : "";
}
}
//billDetail.DELIVERYDATE = DateTime.Now.Date;
//billDetail.QTY = total; //inv.Barcode.Qty.ToDouble();
var isCompletedT = false;
// 鏇存柊鍗曟嵁HEADER鐘舵��
- var billHeaderT = Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(t => t.BILLCODE.ToUpper() == billCodeT).First();
- if (billDetailT.Sum(t => t.PRQTY) == totalT)
+ var billHeaderT = Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(t => t.ORDER_NO.ToUpper() == billCodeT).First();
+ if (billDetailT.Sum(t => t.QTY_REQ) == totalT)
{
foreach (var dtl in billDetailT)
{
- dtl.LINESTATUS = BIZ_WMS_TRANSFER.STATUSs.FINISHED.GetValue();
+ dtl.STATUS = BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue();
}
//barcodeScanned.STATUS = WMS_ITEM.STATUSs.InStore.GetValue();
- if (!Biz.Db.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(t => t.BILLCODE.ToUpper() == billCodeT.ToUpper() && t.ITEM_CODE != inv.ItemInfo.ITEM_CODE && t.LINESTATUS != BIZ_WMS_TRANSFER.STATUSs.FINISHED.GetValue()).Any())
+ if (!Biz.Db.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(t => t.ORDER_NO.ToUpper() == billCodeT.ToUpper() && t.ITEM_CODE != inv.ItemInfo.ITEM_CODE && t.STATUS != BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue()).Any())
{
- billHeaderT.STATUS = BIZ_WMS_TRANSFER.STATUSs.FINISHED.GetValue();
+ billHeaderT.STATUS = BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue();
isCompletedT = true;
}
}
@@ -363,10 +363,10 @@
{
foreach (var dtl in billDetailT)
{
- dtl.LINESTATUS = BIZ_WMS_TRANSFER.STATUSs.WORKING.GetValue();
+ dtl.STATUS = BIZ_WMS_TRANSFER.STATUSs.Storing.GetValue();
}
}
- Logger.Default.Info($"鏇存柊鍗曟嵁鏄庣粏淇℃伅:鍗曞彿[{billCodeT}]锛岄」娆{string.Join(",", billDetailT.Select(q => q.BILLLINE))}]锛屾暟閲廩{string.Join(",", billDetailT.Select(q => q.INVENTORYQTY))}]锛岀姸鎬乕{string.Join(",", billDetail.Select(q => q.LINESTATUS))}]");
+ Logger.Default.Info($"鏇存柊鍗曟嵁鏄庣粏淇℃伅:鍗曞彿[{billCodeT}]锛岄」娆{string.Join(",", billDetailT.Select(q => q.ORDER_LINE))}]锛屾暟閲廩{string.Join(",", billDetailT.Select(q => q.QTY_IN))}]锛岀姸鎬乕{string.Join(",", billDetail.Select(q => q.LINESTATUS))}]");
#endregion
diff --git a/Tiger.Business.WMS/Transaction/Old/OutSplit.cs b/Tiger.Business.WMS/Transaction/Old/OutSplit.cs
index 161402b..2d3b87b 100644
--- a/Tiger.Business.WMS/Transaction/Old/OutSplit.cs
+++ b/Tiger.Business.WMS/Transaction/Old/OutSplit.cs
@@ -206,7 +206,7 @@
var MaterialReqTrans = Biz.Db.Queryable<BIZ_ERP_PROD_OUT>().Where(t => t.BILLCODE == ReqNo).Any();
var OthReqTrans = Biz.Db.Queryable<BIZ_ERP_OTH_OUT>().Where(t => t.BILLCODE == ReqNo).Any();
var SaleReqTrans = Biz.Db.Queryable<BIZ_ERP_SALE_OUT>().Where(t => t.BILLCODE == ReqNo).Any();
- var TfTrans = Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(t => t.BILLCODE == ReqNo).Any();
+ var TfTrans = Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(t => t.ORDER_NO == ReqNo).Any();
ProductionMaterialReq trans = null;
OutWorkOrder owoTrans = null;
OutOther othTrans = null;
diff --git a/Tiger.Business.WMS/Transaction/Old/OutTransfer.cs b/Tiger.Business.WMS/Transaction/Old/OutTransfer.cs
index dbd6da8..9500a4b 100644
--- a/Tiger.Business.WMS/Transaction/Old/OutTransfer.cs
+++ b/Tiger.Business.WMS/Transaction/Old/OutTransfer.cs
@@ -61,7 +61,7 @@
var action = new ApiAction<ProdReqOutput>();
try
{
- req = await Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(x => x.BILLCODE == input.ReqNo).Includes(q => q.DtlsWithGhost, d => d.ItemInfo).IncludesAllFirstLayer().FirstAsync();
+ req = await Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(x => x.ORDER_NO == input.ReqNo).Includes(q => q.DtlsWithGhost, d => d.ItemInfo).IncludesAllFirstLayer().FirstAsync();
//楠岃瘉鏄庣粏鏄惁姝ｇ‘
if (!req.Dtls.Any())
{
@@ -71,9 +71,9 @@
}
//濡傛灉鏄墜宸ュ垱寤虹殑璋冩嫧鍗�
- isManual = req.STATUS == BIZ_WMS_TRANSFER.STATUSs.MANUAL.GetValue();
+ isManual = req.STATUS == BIZ_WMS_TRANSFER.STATUSs.Imported.GetValue();
- Biz.Db.Deleteable<WMS_ITEM_POOL>().Where(q => q.TRANS_CODE == req.BILLCODE).ExecuteCommand();
+ Biz.Db.Deleteable<WMS_ITEM_POOL>().Where(q => q.TRANS_CODE == req.ORDER_NO).ExecuteCommand();
//濡傛灉涓婁竴娆℃帹鑽愭湁鏁版嵁锛屽垯鍏堢伃鎺変寒鐨勭伅
if (Suggests.Any())
{
@@ -82,8 +82,8 @@
var begin = DateTime.Now;
var ElapsedTime = 0.0;
- var sumDtls = req.Dtls.Where(q => q.LINESTATUS != BIZ_WMS_TRANSFER.STATUSs.COMPLETE.GetValue())
- .GroupBy(x => new { x.ITEM_CODE }).Select(x => new { ItemCode = x.Key.ITEM_CODE.ToString(), WarehouseCode = x.Max(t => t.OUTWAREHOUSECODE), actQty = x.Sum(t => t.PRQTY - t.OUTQTY), lockObj = new object() });
+ var sumDtls = req.Dtls.Where(q => q.STATUS != BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue())
+ .GroupBy(x => new { x.ITEM_CODE }).Select(x => new { ItemCode = x.Key.ITEM_CODE.ToString(), WarehouseCode = x.Max(t => t.OUT_WH_CODE), actQty = x.Sum(t => t.QTY_REQ - t.QTY_OUT), lockObj = new object() });
var dic = sumDtls.ToDictionary(k => k, v => new Result<List<SuggestItem>>());
foreach (var item in dic)
{
@@ -92,7 +92,7 @@
{
lock (item.Key.lockObj)
{
- dic[item.Key] = WMS_ITEM_Biz.WmsItem.Suggest(req.BILLCODE, item.Key.ItemCode, item.Key.WarehouseCode, null, null, null, input.AuthOption, item.Key.actQty);
+ dic[item.Key] = WMS_ITEM_Biz.WmsItem.Suggest(req.ORDER_NO, item.Key.ItemCode, item.Key.WarehouseCode, null, null, null, input.AuthOption, item.Key.actQty);
}
});
}
@@ -120,7 +120,7 @@
var actQty = sumDtls.ToList().Where(x => x.ItemCode.Trim() == inv.Item.ITEM_CODE.Trim()).Select(x => x.actQty).FirstOrDefault();
if (actQty > 0)
{
- inv.poolItem = inv.Item.GetPoolItem(input.AuthOption.OrgCode, nameof(req), req.BILLCODE, null, actQty, false);
+ inv.poolItem = inv.Item.GetPoolItem(input.AuthOption.OrgCode, nameof(req), req.ORDER_NO, null, actQty, false);
}
else
{
@@ -169,7 +169,7 @@
await Share.Shelf.LightMulti(TransID, light.Color, locs);
action.Data = new ProdReqOutput()
{
- ReqNo = req.BILLCODE,
+ ReqNo = req.ORDER_NO,
ReqType = light.ReqType.GetValue()
};
action.LocaleMsg = Biz.L("浜伅鎴愬姛锛屼寒鐏鑹瞇{0}]", light.Color.GetDesc());
@@ -206,11 +206,11 @@
var action = new ApiAction();
try
{
- var dtls = req.Dtls.GroupBy(x => new { x.BILLLINE, x.ITEM_CODE, x.ItemInfo.ITEM_NAME }).Select(x => new ProdReqDtl() { BillLine = x.Key.BILLLINE.ToInt32(), ItemCode = x.Key.ITEM_CODE, ItemName = x.Key.ITEM_NAME, Status = "", Items = new List<ProdReqDtlItems>() }).ToList();
+ var dtls = req.Dtls.GroupBy(x => new { x.ORDER_LINE, x.ITEM_CODE, x.ItemInfo.ITEM_NAME }).Select(x => new ProdReqDtl() { BillLine = x.Key.ORDER_LINE.ToInt32(), ItemCode = x.Key.ITEM_CODE, ItemName = x.Key.ITEM_NAME, Status = "", Items = new List<ProdReqDtlItems>() }).ToList();
foreach (var d in dtls)
{
d.Items = Suggests.Where(x => x.Item.ITEM_CODE == d.ItemCode).Select(x => new ProdReqDtlItems { WHCode = x.Warehouse.WH_CODE, LocationCode = x.Location.LOCATION_CODE, SN = x.Item.SN, QTY = x.Item.QTY }).ToList();
- d.Status = $"{(double)req.Dtls.Where(x => x.ITEM_CODE == d.ItemCode).Sum(x => x.OUTQTY)} / {(double)req.Dtls.Where(x => x.ITEM_CODE == d.ItemCode).Sum(x => x.PRQTY)} {Suggests.FirstOrDefault()?.Item?.UNIT} (杩橀渶{d.Items.Count}涓�)";
+ d.Status = $"{(double)req.Dtls.Where(x => x.ITEM_CODE == d.ItemCode).Sum(x => x.QTY_OUT)} / {(double)req.Dtls.Where(x => x.ITEM_CODE == d.ItemCode).Sum(x => x.QTY_REQ)} {Suggests.FirstOrDefault()?.Item?.UNIT} (杩橀渶{d.Items.Count}涓�)";
}
action.Data = itemcode.IsNullOrEmpty() ? dtls.OrderBy(q => q.BillLine) : dtls.Where(x => x.ItemCode == itemcode).FirstOrDefault()?.Items.OrderBy(q => q.SN);
}
@@ -230,7 +230,7 @@
var action = new ApiAction();
try
{
- action.Data = $"鐗╂枡{itemcode}锛氬凡涓嬫灦[{(double)req.Dtls.Where(x => x.ITEM_CODE == itemcode).Sum(x => x.OUTQTY)}]锛屽叡{(double)req.Dtls.Where(x => x.ITEM_CODE == itemcode).Sum(x => x.PRQTY)} {Suggests.FirstOrDefault()?.Item?.UNIT}";
+ action.Data = $"鐗╂枡{itemcode}锛氬凡涓嬫灦[{(double)req.Dtls.Where(x => x.ITEM_CODE == itemcode).Sum(x => x.QTY_OUT)}]锛屽叡{(double)req.Dtls.Where(x => x.ITEM_CODE == itemcode).Sum(x => x.QTY_REQ)} {Suggests.FirstOrDefault()?.Item?.UNIT}";
}
catch (Exception ex)
{
@@ -318,10 +318,10 @@
}
//浠撳簱鍗℃帶
- if (!req.Dtls.Any(q => q.ITEM_CODE == CurInv.ItemInfo.ITEM_CODE && q.OUTWAREHOUSECODE == CurInv.Warehouse.WH_CODE))
+ if (!req.Dtls.Any(q => q.ITEM_CODE == CurInv.ItemInfo.ITEM_CODE && q.OUT_WH_CODE == CurInv.Warehouse.WH_CODE))
{
action.IsSuccessed = false;
- action.LocaleMsg = Biz.L($"鏉＄爜[{CurInv.Barcode.SN}]鐨勬枡鍙锋垨鑰呬粨搴撹窡鍗曟嵁[{req.BILLCODE}]涓婄殑涓嶄竴鑷�");
+ action.LocaleMsg = Biz.L($"鏉＄爜[{CurInv.Barcode.SN}]鐨勬枡鍙锋垨鑰呬粨搴撹窡鍗曟嵁[{req.ORDER_NO}]涓婄殑涓嶄竴鑷�");
return action;
}
@@ -382,7 +382,7 @@
//2.鏄惁瓒呭彂
isExceed = false;
- req = await Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(x => x.BILLCODE == req.BILLCODE).Includes(q => q.DtlsWithGhost, d => d.ItemInfo).IncludesAllFirstLayer().FirstAsync();
+ req = await Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(x => x.ORDER_NO == req.ORDER_NO).Includes(q => q.DtlsWithGhost, d => d.ItemInfo).IncludesAllFirstLayer().FirstAsync();
dtls = req.Dtls.Where(x => x.ITEM_CODE == CurInv.ItemInfo.ITEM_CODE).ToList();
if (dtls.IsNullOrEmpty())
{
@@ -392,13 +392,13 @@
}
//濡傛灉鐘舵�佸畬鎴�
- if (dtls.Where(x => x.LINESTATUS == BIZ_WMS_TRANSFER.STATUSs.COMPLETE.GetValue()).Count() == dtls.Count)
+ if (dtls.Where(x => x.STATUS == BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue()).Count() == dtls.Count)
{
action.IsSuccessed = false;
action.LocaleMsg = Biz.L("鏂欏凡缁忓彂瀹�");
return action;
}
- var actQty = dtls.Sum(x => x.OUTQTY > x.PRQTY ? 0 : x.PRQTY - x.OUTQTY);
+ var actQty = dtls.Sum(x => x.QTY_OUT > x.QTY_REQ ? 0 : x.QTY_REQ - x.QTY_OUT);
cutQty = 0;
if (actQty < CurInv.CurPkg.QTY)
{
@@ -411,26 +411,26 @@
double curQty = CurInv.CurPkg.QTY;
foreach (var d in dtls)
{
- var actPrQty = d.PRQTY - d.OUTQTY;
+ var actPrQty = d.QTY_REQ - d.QTY_OUT;
if (actPrQty > 0 && curQty > 0)
{
if (actPrQty >= curQty)
{
- d.OUTQTY += curQty;
+ d.QTY_OUT += curQty;
curQty = 0;
}
else
{
- d.OUTQTY = d.PRQTY;
+ d.QTY_OUT = d.QTY_REQ;
curQty -= actPrQty;
}
- d.LINESTATUS = d.OUTQTY >= d.PRQTY ? BIZ_WMS_TRANSFER.STATUSs.COMPLETE.GetValue() : BIZ_WMS_TRANSFER.STATUSs.WORKING.GetValue();
+ d.STATUS = d.QTY_OUT >= d.QTY_REQ ? BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue() : BIZ_WMS_TRANSFER.STATUSs.Storing.GetValue();
//d.OUTWAREHOUSECODE = CurInv.Warehouse.WH_CODE;
}
}
if (isExceed)
{
- if (CurInv.ItemInfo.DLVY_TYPE == BAS_ITEM.DLVY_TYPEs.ByDemand.GetValue() || req.BILLCODE.Substring(2, 4) == "5408" || req.BILLCODE.Substring(2, 4) == "5409")
+ if (CurInv.ItemInfo.DLVY_TYPE == BAS_ITEM.DLVY_TYPEs.ByDemand.GetValue() || req.ORDER_NO.Substring(2, 4) == "5408" || req.ORDER_NO.Substring(2, 4) == "5409")
{
isCutting = true;
isExceed = false;
@@ -444,8 +444,8 @@
else
{
//鏈�澶ф暟閲忔槑缁嗚鐢ㄤ簬璋冩嫧锛岃琛屽彂鏂欐暟閲忓姞涓婂簲鎴枡鏁伴噺
- var tfdtl = dtls.OrderBy(q => q.BILLLINE.ToDecimal()).Last();
- tfdtl.OUTQTY += cutQty;
+ var tfdtl = dtls.OrderBy(q => q.ORDER_LINE.ToDecimal()).Last();
+ tfdtl.QTY_OUT += cutQty;
}
}
@@ -543,7 +543,7 @@
CutQty = CurInv.CurPkg.QTY - cutQty,
isCutting = isCutting,
isExceed = isExceed,
- ReqNo = req.BILLCODE,
+ ReqNo = req.ORDER_NO,
regionCode = CurInv.Region.REGION_CODE,
locationCode = CurInv.Location?.LOCATION_CODE,
};
@@ -578,38 +578,36 @@
SN = CurInv.CurPkg.SN,
ITEM_CODE = CurInv.ItemInfo.ITEM_CODE,
QTY = CurInv.CurPkg.QTY,
- META_SN = CurInv.Barcode.MetaSn,
- BILLCODE = req.BILLCODE,
- BILLDATE = req.BILLDATE,
+ ORDER_NO = req.ORDER_NO,
//BILLLINE = tfdtl.BILLLINE
};
//4.鏇存柊涓氬姟鍗曟嵁锛孊IZ_WMS_TRANSFER銆丅IZ_WMS_TRANSFER_DTL銆丅IZ_WMS_TRANSFER_SN 鍒ゆ柇鏄庣粏琛岀姸鎬佹槸鍚﹀畬鎴�
- var isComplete = !req.Dtls.Any(x => x.LINESTATUS != BIZ_WMS_TRANSFER.STATUSs.COMPLETE.GetValue() && x.LINESTATUS != BIZ_WMS_TRANSFER.STATUSs.MANUALCOMPLETE.GetValue() && x.PRQTY > 0);
+ var isComplete = !req.Dtls.Any(x => x.STATUS != BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue() && x.STATUS != BIZ_WMS_TRANSFER.STATUSs.Picked.GetValue() && x.QTY_REQ > 0);
his_isComplete = isComplete;
if (isComplete)
{
//detail鍏ㄩ儴瀹屾垚浜�
- req.STATUS = isManual ? BIZ_WMS_TRANSFER.STATUSs.MANUALCOMPLETE.GetValue() : BIZ_WMS_TRANSFER.STATUSs.COMPLETE.GetValue();
+ req.STATUS = isManual ? BIZ_WMS_TRANSFER.STATUSs.Picked.GetValue() : BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue();
}
else
{
- req.STATUS = BIZ_WMS_TRANSFER.STATUSs.WORKING.GetValue();
+ req.STATUS = BIZ_WMS_TRANSFER.STATUSs.Storing.GetValue();
}
//濡傛灉鏄疉gv
if (CurReqType == ReqType.IsAgv)
{
- req.STATUS = isManual ? BIZ_WMS_TRANSFER.STATUSs.MANUALCOMPLETE.GetValue() : BIZ_WMS_TRANSFER.STATUSs.COMPLETE.GetValue();
+ req.STATUS = isManual ? BIZ_WMS_TRANSFER.STATUSs.Picked.GetValue() : BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue();
}
//5.鍑哄簱涓嬫灦
foreach (var item in CurInv.Items)
{
item.TRANS_CODE = nameof(BIZ_WMS_TRANSFER);
- item.TRANS_NO = req.BILLCODE;
- item.TRANS_LINE = string.Join(",", dtls.Select(x => x.BILLLINE));
+ item.TRANS_NO = req.ORDER_NO;
+ item.TRANS_LINE = string.Join(",", dtls.Select(x => x.ORDER_LINE));
item.SOURCE_CODE = "WORK_ORDER";
- item.SOURCE_ORDER = dtls.First().SOURCECODE;
+ item.SOURCE_ORDER = dtls.First().SOURCE_ORDER;
}
Result<TakeDownInfo> downResult = WMS_ITEM_Biz.WmsItem.TakeDown(CurInv, input.AuthOption, WMS_ITEM.STATUSs.Sended, !isCutting);
if (!downResult.IsSuccessed)
@@ -650,7 +648,7 @@
//6. 瀵规帴MES銆丄gv
- action.LocaleMsg = Biz.L($"璋冩嫧鍑哄簱瀹屾垚锛屽崟鍙穂{req.BILLCODE}]锛屾潯鐮乕{CurInv.SN}]锛岀姸鎬乕{req.STATUS.GetEnumDesc<BIZ_WMS_TRANSFER.STATUSs>()}]");
+ action.LocaleMsg = Biz.L($"璋冩嫧鍑哄簱瀹屾垚锛屽崟鍙穂{req.ORDER_NO}]锛屾潯鐮乕{CurInv.SN}]锛岀姸鎬乕{req.STATUS.GetEnumDesc<BIZ_WMS_TRANSFER.STATUSs>()}]");
action.Data = new ProdReqOutput()
{
SN = CurInv.SN,
@@ -659,7 +657,7 @@
CutQty = CurInv.CurPkg.QTY - cutQty,
isCutting = isCutting,
isExceed = isExceed,
- ReqNo = req.BILLCODE,
+ ReqNo = req.ORDER_NO,
regionCode = CurInv.Region.REGION_CODE,
locationCode = CurInv.Location?.LOCATION_CODE,
};
@@ -694,9 +692,9 @@
{
//needSaveHistoryLog = true;
CloseLight(LocationHis).Wait();
- if (!(req?.BILLCODE ?? "").IsNullOrEmpty())
+ if (!(req?.ORDER_NO ?? "").IsNullOrEmpty())
{
- Biz.Db.Deleteable<WMS_ITEM_POOL>().Where(x => x.TRANS_NO == req.BILLCODE).ExecuteCommand();
+ Biz.Db.Deleteable<WMS_ITEM_POOL>().Where(x => x.TRANS_NO == req.ORDER_NO).ExecuteCommand();
}
Biz.Db.Deleteable<WMS_ITEM_POOL>().Where(q => CurPoolList.Select(q => q.SN).Contains(q.SN)).ExecuteCommand();
//淇濆瓨鎿嶄綔鏃ュ織
diff --git a/Tiger.Business.WMS/Transaction/Old/OutWorkOrder.cs b/Tiger.Business.WMS/Transaction/Old/OutWorkOrder.cs
index eab15ef..b542fd4 100644
--- a/Tiger.Business.WMS/Transaction/Old/OutWorkOrder.cs
+++ b/Tiger.Business.WMS/Transaction/Old/OutWorkOrder.cs
@@ -591,43 +591,42 @@
var tfdtl = dtls.OrderBy(q => q.BILLLINE.ToDecimal()).Last();
tfdtl.QTY += cutQty;
//璋冩嫧
- transferH = Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(x => x.SOURCECODE == req.BILLCODE).First() ?? new()
+ transferH = Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(x => x.SOURCE_ORDER == req.BILLCODE).First() ?? new()
{
- BILLCODE = "TF-" + req.BILLCODE,
- BILLDATE = DateTime.Now,
- STATUS = BIZ_WMS_TRANSFER.STATUSs.INIT.GetValue(),
- BIZTYPE = null,
- OUTWAREHOUSECODE = CurInv.Warehouse.WH_CODE,
- INWAREHOUSECODE = CurInv.Warehouse.TRANSFER_WH,
- SOURCETYPE = 0,
- SOURCECODE = req.BILLCODE,
+ ORDER_NO = "TF-" + req.BILLCODE,
+ ORDER_DATE = DateTime.Now,
+ STATUS = BIZ_WMS_TRANSFER.STATUSs.Init.GetValue(),
+ OUT_WH_CODE = CurInv.Warehouse.WH_CODE,
+ IN_WH_CODE = CurInv.Warehouse.TRANSFER_WH,
+ SOURCE_CODE = nameof(req),
+ SOURCE_ORDER = req.BILLCODE,
AUTH_ORG = OrgCode
};
- transferDtl = Biz.Db.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(x => x.BILLCODE == transferH.BILLCODE && x.BILLLINE == tfdtl.BILLLINE).First() ?? new()
+ transferDtl = Biz.Db.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(x => x.ORDER_NO == transferH.ORDER_NO && x.ORDER_LINE == tfdtl.BILLLINE).First() ?? new()
{
- BILLCODE = transferH.BILLCODE,
- BILLLINE = tfdtl.BILLLINE,
- LINESTATUS = BIZ_WMS_TRANSFER.STATUSs.FINISHED.GetValue(),
+ ORDER_NO = transferH.ORDER_NO,
+ ORDER_LINE = tfdtl.BILLLINE,
+ STATUS = BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue(),
ITEM_CODE = CurInv.ItemInfo.ITEM_CODE,
- UNITCODE = "",
- PRQTY = remainQty,
- OUTQTY = remainQty,
- INQTY = remainQty,
- OUTWAREHOUSECODE = CurInv.Warehouse.WH_CODE,
- INWAREHOUSECODE = CurInv.Warehouse.TRANSFER_WH,
- SOURCETYPE = transferH.SOURCETYPE,
- SOURCECODE = transferH.SOURCECODE,
- SOURCELINE = tfdtl.BILLLINE,
+ UNIT = "",
+ QTY_REQ = remainQty,
+ QTY_OUT = remainQty,
+ QTY_IN = remainQty,
+ OUT_WH_CODE = CurInv.Warehouse.WH_CODE,
+ IN_WH_CODE = CurInv.Warehouse.TRANSFER_WH,
+ SOURCE_CODE = transferH.SOURCE_CODE,
+ SOURCE_ORDER = transferH.SOURCE_ORDER,
+ SOURCE_LINE = tfdtl.BILLLINE,
REMARK = "",
AUTH_ORG = OrgCode
};
- Logger.Interface.Info($"宸ュ崟棰嗘枡 =>鐢熸垚璋冩嫧鏄庣粏锛屽崟鍙凤細[{transferH.BILLCODE}]锛孮ty:{remainQty}锛岀姸鎬�:{transferDtl.LINESTATUS}锛岄」娆★細[{transferDtl.BILLLINE}]");
+ Logger.Interface.Info($"宸ュ崟棰嗘枡 =>鐢熸垚璋冩嫧鏄庣粏锛屽崟鍙凤細[{transferH.ORDER_NO}]锛孮ty:{remainQty}锛岀姸鎬�:{transferDtl.STATUS}锛岄」娆★細[{transferDtl.ORDER_LINE}]");
transferSn = new()
{
- BILLCODE = transferH.BILLCODE,
- BILLLINE = tfdtl.BILLLINE,
+ ORDER_NO = transferH.ORDER_NO,
+ ORDER_LINE = tfdtl.BILLLINE,
ITEM_CODE = CurInv.ItemInfo.ITEM_CODE,
SN = CurInv.CurPkg.SN,
QTY = CurInv.CurPkg.QTY,
@@ -670,11 +669,11 @@
//detail 鍏ㄩ儴瀹屾垚浜�
req.STATUS = BIZ_ERP_PROD_OUT.STATUSs.COMPLETE.GetValue();
Logger.Interface.Info($"宸ュ崟棰嗘枡 =>棰嗘枡鍗昜{req.BILLCODE}]鍙戞枡瀹屾垚锛屽崟澶寸姸鎬�:{req.STATUS}");
- transferH = transferH != null ? transferH : Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(x => x.SOURCECODE == req.BILLCODE).First();
+ transferH = transferH != null ? transferH : Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(x => x.SOURCE_ORDER == req.BILLCODE).First();
if (transferH != null)
{
- transferH.STATUS = BIZ_WMS_TRANSFER.STATUSs.FINISHED.GetValue();
- Logger.Interface.Info($"宸ュ崟棰嗘枡 =>鏇存柊璋冩嫧鍗昜{transferH.BILLCODE}]鐘舵��:{transferH.STATUS}");
+ transferH.STATUS = BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue();
+ Logger.Interface.Info($"宸ュ崟棰嗘枡 =>鏇存柊璋冩嫧鍗昜{transferH.ORDER_NO}]鐘舵��:{transferH.STATUS}");
}
}
else
diff --git a/Tiger.Business.WMS/Transaction/Old/ProductionMaterialReq.cs b/Tiger.Business.WMS/Transaction/Old/ProductionMaterialReq.cs
index d36bcfd..3245a62 100644
--- a/Tiger.Business.WMS/Transaction/Old/ProductionMaterialReq.cs
+++ b/Tiger.Business.WMS/Transaction/Old/ProductionMaterialReq.cs
@@ -721,43 +721,42 @@
var tfdtl = dtls.OrderBy(q => q.BILLLINE.ToDecimal()).Last();
tfdtl.QTY += cutQty;
//璋冩嫧
- transferH = Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(x => x.SOURCECODE == req.BILLCODE).First() ?? new()
+ transferH = Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(x => x.SOURCE_ORDER == req.BILLCODE).First() ?? new()
{
- BILLCODE = "TF-" + req.BILLCODE,
- BILLDATE = DateTime.Now,
- STATUS = BIZ_WMS_TRANSFER.STATUSs.INIT.GetValue(),
- BIZTYPE = null,
- OUTWAREHOUSECODE = CurInv.Warehouse.WH_CODE,
- INWAREHOUSECODE = CurInv.Warehouse.TRANSFER_WH,
- SOURCETYPE = 0,
- SOURCECODE = req.BILLCODE,
+ ORDER_NO = "TF-" + req.BILLCODE,
+ ORDER_DATE = DateTime.Now,
+ STATUS = BIZ_WMS_TRANSFER.STATUSs.Init.GetValue(),
+ OUT_WH_CODE = CurInv.Warehouse.WH_CODE,
+ IN_WH_CODE = CurInv.Warehouse.TRANSFER_WH,
+ SOURCE_CODE = nameof(req),
+ SOURCE_ORDER = req.BILLCODE,
AUTH_ORG = OrgCode
};
- transferDtl = Biz.Db.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(x => x.BILLCODE == transferH.BILLCODE && x.BILLLINE == tfdtl.BILLLINE).First() ?? new()
+ transferDtl = Biz.Db.Queryable<BIZ_WMS_TRANSFER_DTL>().Where(x => x.ORDER_NO == transferH.ORDER_NO && x.ORDER_LINE == tfdtl.BILLLINE).First() ?? new()
{
- BILLCODE = transferH.BILLCODE,
- BILLLINE = tfdtl.BILLLINE,
- LINESTATUS = BIZ_WMS_TRANSFER.STATUSs.FINISHED.GetValue(),
+ ORDER_NO = transferH.ORDER_NO,
+ ORDER_LINE = tfdtl.BILLLINE,
+ STATUS = BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue(),
ITEM_CODE = CurInv.ItemInfo.ITEM_CODE,
- UNITCODE = "",
- PRQTY = remainQty,
- OUTQTY = remainQty,
- INQTY = remainQty,
- OUTWAREHOUSECODE = CurInv.Warehouse.WH_CODE,
- INWAREHOUSECODE = CurInv.Warehouse.TRANSFER_WH,
- SOURCETYPE = transferH.SOURCETYPE,
- SOURCECODE = transferH.SOURCECODE,
- SOURCELINE = tfdtl.BILLLINE,
+ UNIT = "",
+ QTY_REQ = remainQty,
+ QTY_OUT = remainQty,
+ QTY_IN = remainQty,
+ OUT_WH_CODE = CurInv.Warehouse.WH_CODE,
+ IN_WH_CODE = CurInv.Warehouse.TRANSFER_WH,
+ SOURCE_CODE = transferH.SOURCE_CODE,
+ SOURCE_ORDER = transferH.SOURCE_ORDER,
+ SOURCE_LINE = tfdtl.BILLLINE,
REMARK = "",
AUTH_ORG = OrgCode
};
- Logger.Interface.Info($"鐢熶骇棰嗘枡 =>鐢熸垚璋冩嫧鏄庣粏锛屽崟鍙凤細[{transferH.BILLCODE}]锛孮ty:{remainQty}锛岀姸鎬�:{transferDtl.LINESTATUS}锛岄」娆★細[{transferDtl.BILLLINE}]");
+ Logger.Interface.Info($"鐢熶骇棰嗘枡 =>鐢熸垚璋冩嫧鏄庣粏锛屽崟鍙凤細[{transferH.ORDER_NO}]锛孮ty:{remainQty}锛岀姸鎬�:{transferDtl.STATUS}锛岄」娆★細[{transferDtl.ORDER_LINE}]");
transferSn = new()
{
- BILLCODE = transferH.BILLCODE,
- BILLLINE = tfdtl.BILLLINE,
+ ORDER_NO = transferH.ORDER_NO,
+ ORDER_LINE = tfdtl.BILLLINE,
ITEM_CODE = CurInv.ItemInfo.ITEM_CODE,
SN = CurInv.CurPkg.SN,
QTY = CurInv.CurPkg.QTY,
@@ -800,11 +799,11 @@
//detail鍏ㄩ儴瀹屾垚浜�
req.STATUS = BIZ_ERP_PROD_OUT.STATUSs.COMPLETE.GetValue();
Logger.Interface.Info($"鐢熶骇棰嗘枡 =>棰嗘枡鍗昜{req.BILLCODE}]鍙戞枡瀹屾垚锛屽崟澶寸姸鎬�:{req.STATUS}");
- transferH = transferH != null ? transferH : Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(x => x.SOURCECODE == req.BILLCODE).First();
+ transferH = transferH != null ? transferH : Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(x => x.SOURCE_ORDER == req.BILLCODE).First();
if (transferH != null)
{
- transferH.STATUS = BIZ_WMS_TRANSFER.STATUSs.FINISHED.GetValue();
- Logger.Interface.Info($"鐢熶骇棰嗘枡 =>鏇存柊璋冩嫧鍗昜{transferH.BILLCODE}]鐘舵��:{transferH.STATUS}");
+ transferH.STATUS = BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue();
+ Logger.Interface.Info($"鐢熶骇棰嗘枡 =>鏇存柊璋冩嫧鍗昜{transferH.ORDER_NO}]鐘舵��:{transferH.STATUS}");
}
}
else
diff --git a/Tiger.Business.WMS/iWMS/ProdMaterialReq.cs b/Tiger.Business.WMS/iWMS/ProdMaterialReq.cs
index e0f4c49..5ddf9b0 100644
--- a/Tiger.Business.WMS/iWMS/ProdMaterialReq.cs
+++ b/Tiger.Business.WMS/iWMS/ProdMaterialReq.cs
@@ -216,15 +216,15 @@
entity_h.Add(prd_h);
list_dOld.AddRange(list_d);
//妫�鏌ユ湁娌℃湁璋冩嫧鍗曪紝鏈夊氨鏇存柊鐘舵�佷负瀹屾垚
- var transferList = db.Queryable<BIZ_WMS_TRANSFER>().Where(s => s.SOURCECODE == prd_h.BILLCODE).ToList();
+ var transferList = db.Queryable<BIZ_WMS_TRANSFER>().Where(s => s.SOURCE_ORDER == prd_h.BILLCODE).ToList();
if (transferList.Any())
{
foreach (var item in transferList)
{
- item.STATUS = BIZ_WMS_TRANSFER.STATUSs.FINISHED.GetValue();
- item.SOURCECODE = prd_h.BILLCODE;
+ item.STATUS = BIZ_WMS_TRANSFER.STATUSs.Finished.GetValue();
+ item.SOURCE_ORDER = prd_h.BILLCODE;
transferH.Add(item);
- action.Message += $"锛岄鏂欏崟[{prd_h.BILLCODE}]瀵瑰簲璋冩嫧鍗昜{item.BILLCODE}]瀹屾垚";
+ action.Message += $"锛岄鏂欏崟[{prd_h.BILLCODE}]瀵瑰簲璋冩嫧鍗昜{item.ORDER_NO}]瀹屾垚";
}
}
}
@@ -332,16 +332,16 @@
{
var action = new ApiAction<PageAble<BIZ_WMS_TRANSFER>>();
var query = Biz.Db.Queryable<BIZ_WMS_TRANSFER>().Where(x =>
- (x.STATUS == BIZ_WMS_TRANSFER.STATUSs.INIT.GetValue()
- || x.STATUS == BIZ_WMS_TRANSFER.STATUSs.MANUAL.GetValue()
- || x.STATUS == BIZ_WMS_TRANSFER.STATUSs.WORKING.GetValue())
+ (x.STATUS == BIZ_WMS_TRANSFER.STATUSs.Init.GetValue()
+ || x.STATUS == BIZ_WMS_TRANSFER.STATUSs.Imported.GetValue()
+ || x.STATUS == BIZ_WMS_TRANSFER.STATUSs.Storing.GetValue())
&& x.AUTH_ORG == orgcode)
- .WhereIF(!billcode.IsNullOrEmpty(), x => x.BILLCODE.Contains(billcode))
+ .WhereIF(!billcode.IsNullOrEmpty(), x => x.ORDER_NO.Contains(billcode))
.OrderByDescending(x => x.UPDATE_TIME.ToString("yyyy-MM-dd"))
//.OrderBy(x => x.REMARK == "L40774" ? 0 : 1)
//.OrderBy(x => x.SOURCECODE == null ? 1 : 0)
- .OrderByDescending(x => x.BILLDATE)
- .OrderBy(x => new { x.CREATE_TIME, x.BILLCODE})
+ .OrderByDescending(x => x.ORDER_DATE)
+ .OrderBy(x => new { x.CREATE_TIME, x.ORDER_NO})
//.OrderBy(x => x.CREATE_TIME)
.ToPage(pageIndex, pageSize);
diff --git a/Tiger.Model.Net/Entitys/BAS/BAS_ITEM.cs b/Tiger.Model.Net/Entitys/BAS/BAS_ITEM.cs
index 7c0851f..4ac9e29 100644
--- a/Tiger.Model.Net/Entitys/BAS/BAS_ITEM.cs
+++ b/Tiger.Model.Net/Entitys/BAS/BAS_ITEM.cs
@@ -6,137 +6,157 @@
namespace Tiger.Model
{
- /// <summary>
- /// 瀹炰綋锛氱墿鍝佸熀纭�淇℃伅
- /// </summary>
- [Description("Primary:ID")]
- [DisplayName("鐗╁搧鍩虹淇℃伅")]
- [Serializable]
- [SugarTable("BAS_ITEM")]
- public class BAS_ITEM : DbEntityWithAuth
- {
- #region 鏋勯�犲嚱鏁�
- /// <summary>
- /// 瀹炰綋锛氱墿鍝佸熀纭�淇℃伅
- /// </summary>
- public BAS_ITEM() { }
- #endregion
+ /// <summary>
+ /// 瀹炰綋锛氱墿鍝佸熀纭�淇℃伅
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("鐗╁搧鍩虹淇℃伅")]
+ [Serializable]
+ [SugarTable("BAS_ITEM")]
+ public class BAS_ITEM : DbEntityWithAuth
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 瀹炰綋锛氱墿鍝佸熀纭�淇℃伅
+ /// </summary>
+ public BAS_ITEM() {}
+ #endregion
- #region 鍏叡灞炴��
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- [DisplayName("鐗╂枡缂栫爜")]
- public string ITEM_CODE { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- [DisplayName("鐗╂枡鍚嶇О")]
- public string ITEM_NAME { get; set; }
- /// <summary>
- /// 鐗╂枡鎻忚堪
- /// </summary>
- [DisplayName("鐗╂枡鎻忚堪")]
- public string ITEM_DESC { get; set; }
- /// <summary>
- /// 鐗╁搧鍒嗙被缂栫爜
- /// </summary>
- [DisplayName("鐗╁搧鍒嗙被缂栫爜")]
- public string ITEM_TYPE { get; set; }
- /// <summary>
- /// 鐗╂枡鐗堟湰
- /// </summary>
- [DisplayName("鐗╂枡鐗堟湰")]
- public string ITEM_VER { get; set; }
- /// <summary>
- /// 瑙勬牸
- /// </summary>
- [DisplayName("瑙勬牸")]
- public string SPEC { get; set; }
- /// <summary>
- /// 鍌ㄤ綅瑙勬牸(SmallReel鍗疯灏忕洏|BigReel鍗疯澶х洏)
- /// </summary>
- [DisplayName("鍌ㄤ綅瑙勬牸(SmallReel鍗疯灏忕洏|BigReel鍗疯澶х洏)")]
- public string SPEC_WH { get; set; }
- /// <summary>
- /// 棰滆壊
- /// </summary>
- [DisplayName("棰滆壊")]
- public string COLOR { get; set; }
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [DisplayName("鍗曚綅")]
- public string UNIT { get; set; }
- /// <summary>
- /// 鏄惁鎴愬搧(Y/N)
- /// </summary>
- [DisplayName("鏄惁鎴愬搧(Y/N)")]
- public string IS_PROD { get; set; }
- /// <summary>
- /// 浜у搧绫诲瀷
- /// </summary>
- [DisplayName("浜у搧绫诲瀷")]
- public string PROD_TYPE { get; set; }
- /// <summary>
- /// 瀹㈡埛浜у搧缂栫爜
- /// </summary>
- [DisplayName("瀹㈡埛浜у搧缂栫爜")]
- public string CUST_PROD_CODE { get; set; }
- /// <summary>
- /// 鏄惁鍚敤(Y/N)
- /// </summary>
- [DisplayName("鏄惁鍚敤(Y/N)")]
- public string IS_ACTIVE { get; set; }
- /// <summary>
- /// 绠℃帶鏂瑰紡锛圔atch鎵规绠℃帶/Single鍗曚欢绠℃帶锛�
- /// </summary>
- [DisplayName("绠℃帶鏂瑰紡锛圔atch鎵规绠℃帶/Single鍗曚欢绠℃帶锛�")]
- public string CTRL_MODE { get; set; }
- /// <summary>
- /// 鍙戝竷鏃堕棿
- /// </summary>
- [DisplayName("鍙戝竷鏃堕棿")]
- public DateTime RELEASE_TIME { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 鐢熸晥鏃堕棿
- /// </summary>
- [DisplayName("鐢熸晥鏃堕棿")]
- public DateTime EFFECTIVE_TIME { get; set; } = DateTime.MinValue;
- /// <summary>
- /// 鏈夋晥澶╂暟
- /// </summary>
- [DisplayName("鏈夋晥澶╂暟")]
- public double VALIDITY_DAYS { get; set; }
- /// <summary>
- /// 鍙戞枡绠℃帶(0ByDemand鎸夐渶鍙戞枡|1ByMinPackage鏈�灏忓寘瑁呭彂鏂�)
- /// </summary>
- [DisplayName("鍙戞枡绠℃帶(0ByDemand鎸夐渶鍙戞枡|1ByMinPackage鏈�灏忓寘瑁呭彂鏂�)")]
- public int DLVY_TYPE { get; set; }
- /// <summary>
- /// 鏄惁鍚敤鍏堣繘鍏堝嚭(Y/N)
- /// </summary>
- [DisplayName("鏄惁鍚敤鍏堣繘鍏堝嚭(Y/N)")]
- public string ENABLE_FIFO { get; set; }
- /// <summary>
- /// 鏉＄爜瑙勫垯缂栫爜
- /// </summary>
- [DisplayName("鏉＄爜瑙勫垯缂栫爜")]
- public string RULE_CODE { get; set; }
- /// <summary>
+ #region 鍏叡灞炴��
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [DisplayName("鐗╂枡缂栫爜")]
+ public string ITEM_CODE { get; set; }
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [DisplayName("鐗╂枡鍚嶇О")]
+ public string ITEM_NAME { get; set; }
+ /// <summary>
+ /// 鐗╂枡鎻忚堪
+ /// </summary>
+ [DisplayName("鐗╂枡鎻忚堪")]
+ public string ITEM_DESC { get; set; }
+ /// <summary>
+ /// 鐗╁搧鍒嗙被缂栫爜
+ /// </summary>
+ [DisplayName("鐗╁搧鍒嗙被缂栫爜")]
+ public string ITEM_TYPE { get; set; }
+ /// <summary>
+ /// 鐗╂枡鐗堟湰
+ /// </summary>
+ [DisplayName("鐗╂枡鐗堟湰")]
+ public string ITEM_VER { get; set; }
+ /// <summary>
+ /// 瑙勬牸
+ /// </summary>
+ [DisplayName("瑙勬牸")]
+ public string SPEC { get; set; }
+ /// <summary>
+ /// 鍌ㄤ綅瑙勬牸(SmallReel鍗疯灏忕洏|BigReel鍗疯澶х洏)
+ /// </summary>
+ [DisplayName("鍌ㄤ綅瑙勬牸(SmallReel鍗疯灏忕洏|BigReel鍗疯澶х洏)")]
+ public string SPEC_WH { get; set; }
+ /// <summary>
+ /// 棰滆壊
+ /// </summary>
+ [DisplayName("棰滆壊")]
+ public string COLOR { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [DisplayName("鍗曚綅")]
+ public string UNIT { get; set; }
+ /// <summary>
+ /// 鏄惁鎴愬搧(Y/N)
+ /// </summary>
+ [DisplayName("鏄惁鎴愬搧(Y/N)")]
+ public string IS_PROD { get; set; }
+ /// <summary>
+ /// 浜у搧绫诲瀷
+ /// </summary>
+ [DisplayName("浜у搧绫诲瀷")]
+ public string PROD_TYPE { get; set; }
+ /// <summary>
+ /// 瀹㈡埛浜у搧缂栫爜
+ /// </summary>
+ [DisplayName("瀹㈡埛浜у搧缂栫爜")]
+ public string CUST_PROD_CODE { get; set; }
+ /// <summary>
+ /// 鏄惁鍚敤(Y/N)
+ /// </summary>
+ [DisplayName("鏄惁鍚敤(Y/N)")]
+ public string IS_ACTIVE { get; set; }
+ /// <summary>
+ /// 绠℃帶鏂瑰紡锛圔atch鎵规绠℃帶/Single鍗曚欢绠℃帶锛�
+ /// </summary>
+ [DisplayName("绠℃帶鏂瑰紡锛圔atch鎵规绠℃帶/Single鍗曚欢绠℃帶锛�")]
+ public string CTRL_MODE { get; set; }
+ /// <summary>
+ /// 鍙戝竷鏃堕棿
+ /// </summary>
+ [DisplayName("鍙戝竷鏃堕棿")]
+ public DateTime RELEASE_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 鐢熸晥鏃堕棿
+ /// </summary>
+ [DisplayName("鐢熸晥鏃堕棿")]
+ public DateTime EFFECTIVE_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 鏈夋晥澶╂暟
+ /// </summary>
+ [DisplayName("鏈夋晥澶╂暟")]
+ public double VALIDITY_DAYS { get; set; }
+ /// <summary>
+ /// 鍙戞枡绠℃帶(0ByDemand鎸夐渶鍙戞枡|1ByMinPackage鏈�灏忓寘瑁呭彂鏂�)
+ /// </summary>
+ [DisplayName("鍙戞枡绠℃帶(0ByDemand鎸夐渶鍙戞枡|1ByMinPackage鏈�灏忓寘瑁呭彂鏂�)")]
+ public int DLVY_TYPE { get; set; }
+ /// <summary>
+ /// 鏄惁鍚敤鍏堣繘鍏堝嚭(Y/N)
+ /// </summary>
+ [DisplayName("鏄惁鍚敤鍏堣繘鍏堝嚭(Y/N)")]
+ public string ENABLE_FIFO { get; set; }
+ /// <summary>
+ /// 鏉＄爜瑙勫垯缂栫爜
+ /// </summary>
+ [DisplayName("鏉＄爜瑙勫垯缂栫爜")]
+ public string RULE_CODE { get; set; }
+ /// <summary>
/// 榛樿宸ヨ壓璺嚎缂栫爜
/// </summary>
[DisplayName("榛樿宸ヨ壓璺嚎缂栫爜")]
- public string DEFAULT_ROUTE { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [DisplayName("澶囨敞")]
- public string REMARK { get; set; }
- #endregion
+ public string DEFAULT_ROUTE { get; set; }
+ /// <summary>
+ /// 榛樿浠撳簱
+ /// </summary>
+ [DisplayName("榛樿浠撳簱")]
+ public string DEFAULT_WH { get; set; }
+ /// <summary>
+ /// 榛樿鍌ㄥ尯
+ /// </summary>
+ [DisplayName("榛樿鍌ㄥ尯")]
+ public string DEFAULT_REGION { get; set; }
+ /// <summary>
+ /// 榛樿璐ф灦/鏂欒溅
+ /// </summary>
+ [DisplayName("榛樿璐ф灦/鏂欒溅")]
+ public string DEFAULT_SHELF { get; set; }
+ /// <summary>
+ /// 榛樿鍌ㄤ綅
+ /// </summary>
+ [DisplayName("榛樿鍌ㄤ綅")]
+ public string DEFAULT_LOCATION { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [DisplayName("澶囨敞")]
+ public string REMARK { get; set; }
+ #endregion
- #region 铏氭嫙灞炴��
- /*渚嬪瓙
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
@@ -147,8 +167,8 @@
public double DepositDays { get; set; }
#endregion 铏氭嫙灞炴��
- #region 澶栭敭灞炴��
- /*渚嬪瓙
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
//涓�瀵逛竴澶栭敭瀵艰埅
[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊AS_ITEM绫婚噷闈㈢殑澶栭敭ID瀛楁
public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
@@ -163,8 +183,8 @@
public BAS_ITEM_EXT ExtInfo { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
#endregion
- #region 鏋氫妇鍙橀噺
- /*渚嬪瓙
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
[Description("鏋氫妇鎻忚堪0")]
@@ -174,21 +194,21 @@
}
*/
- /// <summary>
- /// 鏋氫妇锛氬彂鏂欑鎺�(0ByDemand鎸夐渶鍙戞枡|1ByMinPackage鏈�灏忓寘瑁呭彂鏂�)
- /// </summary>
- public enum DLVY_TYPEs
- {
- [Description("鎸夐渶鍙戞枡")]
- ByDemand = 0,
- [Description("鏈�灏忓寘瑁呭彂鏂�")]
- ByMinPackage = 1,
- }
- #endregion
+ /// <summary>
+ /// 鏋氫妇锛氬彂鏂欑鎺�(0ByDemand鎸夐渶鍙戞枡|1ByMinPackage鏈�灏忓寘瑁呭彂鏂�)
+ /// </summary>
+ public enum DLVY_TYPEs
+ {
+ [Description("鎸夐渶鍙戞枡")]
+ ByDemand = 0,
+ [Description("鏈�灏忓寘瑁呭彂鏂�")]
+ ByMinPackage = 1,
+ }
+ #endregion
- #region 鍏叡鏂规硶
+ #region 鍏叡鏂规硶
- #endregion
+ #endregion
- }//endClass
+ }//endClass
}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_ItemMaster.cs b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_ItemMaster.cs
index ade425d..f2c392d 100644
--- a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_ItemMaster.cs
+++ b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_ItemMaster.cs
@@ -130,6 +130,10 @@
/// 打印模式
/// </summary>
public int ReceiptMode { get; set; }
+ /// <summary>
+ /// 默认储位
+ /// </summary>
+ public string BinCode { get; set; }
#endregion
#region 虚拟属性
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_ITEM_CVT.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_ITEM_CVT.cs
new file mode 100644
index 0000000..48a5657
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_ITEM_CVT.cs
@@ -0,0 +1,145 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 实体：物品转变单(WMS)
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("物品转变单(WMS)")]
+ [Serializable]
+ [SugarTable("BIZ_ITEM_CVT")]
+ public class BIZ_ITEM_CVT : DbEntityWithAuth
+ {
+ #region 构造函数
+ /// <summary>
+ /// 实体：物品转变单(WMS)
+ /// </summary>
+ public BIZ_ITEM_CVT() {}
+ #endregion
+
+ #region 公共属性
+ /// <summary>
+ /// 转变单号
+ /// </summary>
+ [DisplayName("转变单号")]
+ public string ORDER_NO { get; set; }
+ /// <summary>
+ /// 单据日期
+ /// </summary>
+ [DisplayName("单据日期")]
+ public DateTime ORDER_DATE { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 状态(0Init新创建|1Working作业中|2Pending待审核|3Finished已完成|4Failed审核失败|7Cancel已作废)
+ /// </summary>
+ [DisplayName("状态(0Init新创建|1Working作业中|2Pending待审核|3Finished已完成|4Failed审核失败|7Cancel已作废)")]
+ public int STATUS { get; set; }
+ /// <summary>
+ /// ERP类型
+ /// </summary>
+ [DisplayName("ERP类型")]
+ public string ERP_TYPE_CODE { get; set; }
+ /// <summary>
+ /// ERP类型名称
+ /// </summary>
+ [DisplayName("ERP类型名称")]
+ public string ERP_TYPE_NAME { get; set; }
+ /// <summary>
+ /// ERP单据状态
+ /// </summary>
+ [DisplayName("ERP单据状态")]
+ public string ERP_STATUS_CODE { get; set; }
+ /// <summary>
+ /// ERP单据状态名称
+ /// </summary>
+ [DisplayName("ERP单据状态名称")]
+ public string ERP_STATUS_NAME { get; set; }
+ /// <summary>
+ /// 备注
+ /// </summary>
+ [DisplayName("备注")]
+ public string REMARK { get; set; }
+ /// <summary>
+ /// -1:未处理，0:同步处理完，>0:同步处理失败次数
+ /// </summary>
+ [DisplayName("-1:未处理，0:同步处理完，>0:同步处理失败次数")]
+ public int HANDLED { get; set; } = -1;
+ /// <summary>
+ /// 最后一次同步处理日期
+ /// </summary>
+ [DisplayName("最后一次同步处理日期")]
+ public DateTime HANDLED_DATE { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 过账提交的JSON
+ /// </summary>
+ [DisplayName("过账提交的JSON")]
+ public string COMMIT_JSON { get; set; }
+ /// <summary>
+ /// 过账提交的返回信息
+ /// </summary>
+ [DisplayName("过账提交的返回信息")]
+ public string COMMIT_MSG { get; set; }
+ #endregion
+
+ #region 虚拟属性
+ /*例子
+ [SugarColumn(IsIgnore = true)]
+ public string FieldName { get; set; }
+ */
+ #endregion
+
+ #region 外键属性
+ /*例子
+ //一对一外键导航
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_ITEM_CVT类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_ITEM_CVTId))]//ClassA表中的BIZ_ITEM_CVTId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_ITEM_CVTId), nameof(MappingClass.ClassAId))]//注意顺序
+ public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ */
+ #endregion
+
+ #region 枚举变量
+ /*例子
+ public enum FieldNames
+ {
+ [Description("枚举描述0")]
+ Enum0,
+ [Description("枚举描述1")]
+ Enum1,
+ }
+ */
+
+ /// <summary>
+ /// 枚举：状态(0Init新创建|1Working作业中|2Pending待审核|3Finished已完成|4Failed审核失败|7Cancel已作废)
+ /// </summary>
+ public enum STATUSs
+ {
+ [Description("新创建")]
+ Init = 0,
+ [Description("作业中")]
+ Working = 1,
+ [Description("待审核")]
+ Pending = 2,
+ [Description("已完成")]
+ Finished = 3,
+ [Description("审核失败")]
+ Failed = 4,
+ [Description("已作废")]
+ Cancel = 7,
+ }
+ #endregion
+
+ #region 公共方法
+
+ #endregion
+
+ }//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_ITEM_CVT_DTL.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_ITEM_CVT_DTL.cs
new file mode 100644
index 0000000..cea9478
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_ITEM_CVT_DTL.cs
@@ -0,0 +1,161 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 实体：物品转变单(WMS)明细
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("物品转变单(WMS)明细")]
+ [Serializable]
+ [SugarTable("BIZ_ITEM_CVT_DTL")]
+ public class BIZ_ITEM_CVT_DTL : DbEntityWithAuth
+ {
+ #region 构造函数
+ /// <summary>
+ /// 实体：物品转变单(WMS)明细
+ /// </summary>
+ public BIZ_ITEM_CVT_DTL() {}
+ #endregion
+
+ #region 公共属性
+ /// <summary>
+ /// 转变单号
+ /// </summary>
+ [DisplayName("转变单号")]
+ public string ORDER_NO { get; set; }
+ /// <summary>
+ /// 转变单行号
+ /// </summary>
+ [DisplayName("转变单行号")]
+ public string ORDER_LINE { get; set; }
+ /// <summary>
+ /// 状态(同单据状态)
+ /// </summary>
+ [DisplayName("状态(同单据状态)")]
+ public int STATUS { get; set; }
+ /// <summary>
+ /// 原物料编码
+ /// </summary>
+ [DisplayName("原物料编码")]
+ public string ITEM_CODE_BF { get; set; }
+ /// <summary>
+ /// 原物料名称
+ /// </summary>
+ [DisplayName("原物料名称")]
+ public string ITEM_NAME_BF { get; set; }
+ /// <summary>
+ /// 转变后物料编码
+ /// </summary>
+ [DisplayName("转变后物料编码")]
+ public string ITEM_CODE_AF { get; set; }
+ /// <summary>
+ /// 转变后物料名称
+ /// </summary>
+ [DisplayName("转变后物料名称")]
+ public string ITEM_NAME_AF { get; set; }
+ /// <summary>
+ /// 转变数量
+ /// </summary>
+ [DisplayName("转变数量")]
+ public double QTY { get; set; }
+ /// <summary>
+ /// ERP转变类型
+ /// </summary>
+ [DisplayName("ERP转变类型")]
+ public string ERP_TYPE_CODE { get; set; }
+ /// <summary>
+ /// ERP转变名称
+ /// </summary>
+ [DisplayName("ERP转变名称")]
+ public string ERP_TYPE_NAME { get; set; }
+ /// <summary>
+ /// 库存单位
+ /// </summary>
+ [DisplayName("库存单位")]
+ public string STORE_UNIT { get; set; }
+ /// <summary>
+ /// 库存单位数量
+ /// </summary>
+ [DisplayName("库存单位数量")]
+ public double STORE_UNIT_QTY { get; set; }
+ /// <summary>
+ /// 成本单位
+ /// </summary>
+ [DisplayName("成本单位")]
+ public string COST_UNIT { get; set; }
+ /// <summary>
+ /// 成本单位数量
+ /// </summary>
+ [DisplayName("成本单位数量")]
+ public double COST_UNIT_QTY { get; set; }
+ /// <summary>
+ /// 仓库编码(ERP)
+ /// </summary>
+ [DisplayName("仓库编码(ERP)")]
+ public string WH_CODE { get; set; }
+ /// <summary>
+ /// 仓库名称(ERP)
+ /// </summary>
+ [DisplayName("仓库名称(ERP)")]
+ public string WH_NAME { get; set; }
+ /// <summary>
+ /// 储位编码(ERP)
+ /// </summary>
+ [DisplayName("储位编码(ERP)")]
+ public string LOCATION_CODE { get; set; }
+ /// <summary>
+ /// 批次号(ERP)
+ /// </summary>
+ [DisplayName("批次号(ERP)")]
+ public string LOTNO { get; set; }
+ /// <summary>
+ /// 备注
+ /// </summary>
+ [DisplayName("备注")]
+ public string REMARK { get; set; }
+ #endregion
+
+ #region 虚拟属性
+ /*例子
+ [SugarColumn(IsIgnore = true)]
+ public string FieldName { get; set; }
+ */
+ #endregion
+
+ #region 外键属性
+ /*例子
+ //一对一外键导航
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_ITEM_CVT_DTL类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_ITEM_CVT_DTLId))]//ClassA表中的BIZ_ITEM_CVT_DTLId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_ITEM_CVT_DTLId), nameof(MappingClass.ClassAId))]//注意顺序
+ public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ */
+ #endregion
+
+ #region 枚举变量
+ /*例子
+ public enum FieldNames
+ {
+ [Description("枚举描述0")]
+ Enum0,
+ [Description("枚举描述1")]
+ Enum1,
+ }
+ */
+ #endregion
+
+ #region 公共方法
+
+ #endregion
+
+ }//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_ITEM_CVT_SN.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_ITEM_CVT_SN.cs
new file mode 100644
index 0000000..44a1d92
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_ITEM_CVT_SN.cs
@@ -0,0 +1,136 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 实体：物品转变单(WMS)条码明细
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("物品转变单(WMS)条码明细")]
+ [Serializable]
+ [SugarTable("BIZ_ITEM_CVT_SN")]
+ public class BIZ_ITEM_CVT_SN : DbEntityWithAuth
+ {
+ #region 构造函数
+ /// <summary>
+ /// 实体：物品转变单(WMS)条码明细
+ /// </summary>
+ public BIZ_ITEM_CVT_SN() {}
+ #endregion
+
+ #region 公共属性
+ /// <summary>
+ /// 转变单号
+ /// </summary>
+ [DisplayName("转变单号")]
+ public string ORDER_NO { get; set; }
+ /// <summary>
+ /// 转变单行号
+ /// </summary>
+ [DisplayName("转变单行号")]
+ public string ORDER_LINE { get; set; }
+ /// <summary>
+ /// 物品标签
+ /// </summary>
+ [DisplayName("物品标签")]
+ public string SN { get; set; }
+ /// <summary>
+ /// 原物料编码
+ /// </summary>
+ [DisplayName("原物料编码")]
+ public string ITEM_CODE_BF { get; set; }
+ /// <summary>
+ /// 原物料名称
+ /// </summary>
+ [DisplayName("原物料名称")]
+ public string ITEM_NAME_BF { get; set; }
+ /// <summary>
+ /// 转变后物料编码
+ /// </summary>
+ [DisplayName("转变后物料编码")]
+ public string ITEM_CODE_AF { get; set; }
+ /// <summary>
+ /// 转变后物料名称
+ /// </summary>
+ [DisplayName("转变后物料名称")]
+ public string ITEM_NAME_AF { get; set; }
+ /// <summary>
+ /// 物品数量
+ /// </summary>
+ [DisplayName("物品数量")]
+ public double QTY { get; set; }
+ /// <summary>
+ /// 所在仓库
+ /// </summary>
+ [DisplayName("所在仓库")]
+ public string WH_CODE { get; set; }
+ /// <summary>
+ /// 所在储区
+ /// </summary>
+ [DisplayName("所在储区")]
+ public string REGION_CODE { get; set; }
+ /// <summary>
+ /// 所在货架
+ /// </summary>
+ [DisplayName("所在货架")]
+ public string SHELF_CODE { get; set; }
+ /// <summary>
+ /// 所在储位
+ /// </summary>
+ [DisplayName("所在储位")]
+ public string LOCATION_CODE { get; set; }
+ /// <summary>
+ /// 当前操作时间
+ /// </summary>
+ [DisplayName("当前操作时间")]
+ public DateTime OPERATION_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 备注
+ /// </summary>
+ [DisplayName("备注")]
+ public string REMARK { get; set; }
+ #endregion
+
+ #region 虚拟属性
+ /*例子
+ [SugarColumn(IsIgnore = true)]
+ public string FieldName { get; set; }
+ */
+ #endregion
+
+ #region 外键属性
+ /*例子
+ //一对一外键导航
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_ITEM_CVT_SN类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_ITEM_CVT_SNId))]//ClassA表中的BIZ_ITEM_CVT_SNId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_ITEM_CVT_SNId), nameof(MappingClass.ClassAId))]//注意顺序
+ public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ */
+ #endregion
+
+ #region 枚举变量
+ /*例子
+ public enum FieldNames
+ {
+ [Description("枚举描述0")]
+ Enum0,
+ [Description("枚举描述1")]
+ Enum1,
+ }
+ */
+ #endregion
+
+ #region 公共方法
+
+ #endregion
+
+ }//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_SCM_OUT.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_SCM_OUT.cs
new file mode 100644
index 0000000..3f0ecdd
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_SCM_OUT.cs
@@ -0,0 +1,167 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 实体：委外发料单(U9)
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("委外发料单(U9)")]
+ [Serializable]
+ [SugarTable("BIZ_U9_SCM_OUT")]
+ public class BIZ_U9_SCM_OUT : DbEntityWithAuth
+ {
+ #region 构造函数
+ /// <summary>
+ /// 实体：委外发料单(U9)
+ /// </summary>
+ public BIZ_U9_SCM_OUT() {}
+ #endregion
+
+ #region 公共属性
+ /// <summary>
+ /// 单据号
+ /// </summary>
+ [DisplayName("单据号")]
+ public string ORDER_NO { get; set; }
+ /// <summary>
+ /// 状态(0Init初始化|1WaitPick待捡料|2Picking捡料中|3Picked已捡完|4Sended已发料|5Close已关闭|6Cancel作废)
+ /// </summary>
+ [DisplayName("状态(0Init初始化|1WaitPick待捡料|2Picking捡料中|3Picked已捡完|4Sended已发料|5Close已关闭|6Cancel作废)")]
+ public int STATUS { get; set; }
+ /// <summary>
+ /// 单据日期
+ /// </summary>
+ [DisplayName("单据日期")]
+ public DateTime ORDER_DATE { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 供应商组织
+ /// </summary>
+ [DisplayName("供应商组织")]
+ public string SUPP_ORG { get; set; }
+ /// <summary>
+ /// 采购单ID
+ /// </summary>
+ [DisplayName("采购单ID")]
+ public string PO_ID { get; set; }
+ /// <summary>
+ /// 采购单号
+ /// </summary>
+ [DisplayName("采购单号")]
+ public string PO_NO { get; set; }
+ /// <summary>
+ /// 备料人
+ /// </summary>
+ [DisplayName("备料人")]
+ public string PREP_PERSON { get; set; }
+ /// <summary>
+ /// 备料完成时间
+ /// </summary>
+ [DisplayName("备料完成时间")]
+ public DateTime FINISH_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 领料人
+ /// </summary>
+ [DisplayName("领料人")]
+ public string REQ_PERSON { get; set; }
+ /// <summary>
+ /// 领料部门
+ /// </summary>
+ [DisplayName("领料部门")]
+ public string REQ_DEPT { get; set; }
+ /// <summary>
+ /// 出库时间
+ /// </summary>
+ [DisplayName("出库时间")]
+ public DateTime DLVY_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 备注
+ /// </summary>
+ [DisplayName("备注")]
+ public string REMARK { get; set; }
+ /// <summary>
+ /// -1:未处理，0:同步处理完，>0:同步处理失败次数
+ /// </summary>
+ [DisplayName("-1:未处理，0:同步处理完，>0:同步处理失败次数")]
+ public int HANDLED { get; set; }
+ /// <summary>
+ /// 最后一次同步处理日期
+ /// </summary>
+ [DisplayName("最后一次同步处理日期")]
+ public DateTime HANDLED_DATE { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 过账提交的JSON
+ /// </summary>
+ [DisplayName("过账提交的JSON")]
+ public string COMMIT_JSON { get; set; }
+ /// <summary>
+ /// 过账提交的返回信息
+ /// </summary>
+ [DisplayName("过账提交的返回信息")]
+ public string COMMIT_MSG { get; set; }
+ #endregion
+
+ #region 虚拟属性
+ /*例子
+ [SugarColumn(IsIgnore = true)]
+ public string FieldName { get; set; }
+ */
+ #endregion
+
+ #region 外键属性
+ /*例子
+ //一对一外键导航
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_SCM_OUT类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_SCM_OUTId))]//ClassA表中的BIZ_U9_SCM_OUTId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_SCM_OUTId), nameof(MappingClass.ClassAId))]//注意顺序
+ public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ */
+ #endregion
+
+ #region 枚举变量
+ /*例子
+ public enum FieldNames
+ {
+ [Description("枚举描述0")]
+ Enum0,
+ [Description("枚举描述1")]
+ Enum1,
+ }
+ */
+
+ /// <summary>
+ /// 枚举：状态(0Init初始化|1WaitPick待捡料|2Picking捡料中|3Picked已捡完|4Sended已发料|5Close已关闭|6Cancel作废)
+ /// </summary>
+ public enum STATUSs
+ {
+ [Description("初始化")]
+ Init = 0,
+ [Description("待捡料")]
+ WaitPick = 1,
+ [Description("捡料中")]
+ Picking = 2,
+ [Description("已捡完")]
+ Picked = 3,
+ [Description("已发料")]
+ Sended = 4,
+ [Description("已关闭")]
+ Close = 5,
+ [Description("作废")]
+ Cancel = 6,
+ }
+ #endregion
+
+ #region 公共方法
+
+ #endregion
+
+ }//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_SCM_OUT_DTL.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_SCM_OUT_DTL.cs
new file mode 100644
index 0000000..fe61432
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_SCM_OUT_DTL.cs
@@ -0,0 +1,161 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+ /// <summary>
+ /// 实体：委外发料单(U9)明细
+ /// </summary>
+ [Description("Primary:ID")]
+ [DisplayName("委外发料单(U9)明细")]
+ [Serializable]
+ [SugarTable("BIZ_U9_SCM_OUT_DTL")]
+ public class BIZ_U9_SCM_OUT_DTL : DbEntityWithAuth
+ {
+ #region 构造函数
+ /// <summary>
+ /// 实体：委外发料单(U9)明细
+ /// </summary>
+ public BIZ_U9_SCM_OUT_DTL() {}
+ #endregion
+
+ #region 公共属性
+ /// <summary>
+ /// 单据号
+ /// </summary>
+ [DisplayName("单据号")]
+ public string ORDER_NO { get; set; }
+ /// <summary>
+ /// 单据行号
+ /// </summary>
+ [DisplayName("单据行号")]
+ public string LINE_NO { get; set; }
+ /// <summary>
+ /// 状态(同单据状态)
+ /// </summary>
+ [DisplayName("状态(同单据状态)")]
+ public int STATUS { get; set; }
+ /// <summary>
+ /// 物料ID
+ /// </summary>
+ [DisplayName("物料ID")]
+ public string ITEM_ID { get; set; }
+ /// <summary>
+ /// 物料编码
+ /// </summary>
+ [DisplayName("物料编码")]
+ public string ITEM_CODE { get; set; }
+ /// <summary>
+ /// 单位
+ /// </summary>
+ [DisplayName("单位")]
+ public string UNIT { get; set; }
+ /// <summary>
+ /// 单据数量
+ /// </summary>
+ [DisplayName("单据数量")]
+ public double QTY { get; set; }
+ /// <summary>
+ /// 已备料数量
+ /// </summary>
+ [DisplayName("已备料数量")]
+ public double QTY_PREP { get; set; }
+ /// <summary>
+ /// 已发料数量
+ /// </summary>
+ [DisplayName("已发料数量")]
+ public double QTY_DLVY { get; set; }
+ /// <summary>
+ /// 领料未发数量
+ /// </summary>
+ [DisplayName("领料未发数量")]
+ public double QTY_NOTDLVY { get; set; }
+ /// <summary>
+ /// 发料方式(ERP)
+ /// </summary>
+ [DisplayName("发料方式(ERP)")]
+ public string DLVY_TYPE { get; set; }
+ /// <summary>
+ /// 发料方式名称(ERP)
+ /// </summary>
+ [DisplayName("发料方式名称(ERP)")]
+ public string DLVY_NAME { get; set; }
+ /// <summary>
+ /// 仓库编码(ERP)
+ /// </summary>
+ [DisplayName("仓库编码(ERP)")]
+ public string WH_ID { get; set; }
+ /// <summary>
+ /// 仓库编码(ERP)
+ /// </summary>
+ [DisplayName("仓库编码(ERP)")]
+ public string WH_CODE { get; set; }
+ /// <summary>
+ /// 仓库名称(ERP)
+ /// </summary>
+ [DisplayName("仓库名称(ERP)")]
+ public string WH_NAME { get; set; }
+ /// <summary>
+ /// 储位编码(ERP)
+ /// </summary>
+ [DisplayName("储位编码(ERP)")]
+ public string LOCATION_ID { get; set; }
+ /// <summary>
+ /// 储位编码(ERP)
+ /// </summary>
+ [DisplayName("储位编码(ERP)")]
+ public string LOCATION_CODE { get; set; }
+ /// <summary>
+ /// 储位名称(ERP)
+ /// </summary>
+ [DisplayName("储位名称(ERP)")]
+ public string LOCATION_NAME { get; set; }
+ /// <summary>
+ /// 备注
+ /// </summary>
+ [DisplayName("备注")]
+ public string REMARK { get; set; }
+ #endregion
+
+ #region 虚拟属性
+ /*例子
+ [SugarColumn(IsIgnore = true)]
+ public string FieldName { get; set; }
+ */
+ #endregion
+
+ #region 外键属性
+ /*例子
+ //一对一外键导航
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_SCM_OUT_DTL类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_SCM_OUT_DTLId))]//ClassA表中的BIZ_U9_SCM_OUT_DTLId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_SCM_OUT_DTLId), nameof(MappingClass.ClassAId))]//注意顺序
+ public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+ */
+ #endregion
+
+ #region 枚举变量
+ /*例子
+ public enum FieldNames
+ {
+ [Description("枚举描述0")]
+ Enum0,
+ [Description("枚举描述1")]
+ Enum1,
+ }
+ */
+ #endregion
+
+ #region 公共方法
+
+ #endregion
+
+ }//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs
index 903637f..28b5662 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs
@@ -27,7 +27,7 @@
/// 备料单号
/// </summary>
[DisplayName("备料单号")]
- public string PREP_NO { get; set; }
+ public string ORDER_NO { get; set; }
/// <summary>
/// 类型(0Supply正常备料|1First首套备料)
/// </summary>
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_DTL.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_DTL.cs
index cd8a177..a26d6c5 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_DTL.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_DTL.cs
@@ -27,12 +27,12 @@
/// 备料单号
/// </summary>
[DisplayName("备料单号")]
- public string PREP_NO { get; set; }
+ public string ORDER_NO { get; set; }
/// <summary>
/// 备料单行号
/// </summary>
[DisplayName("备料单行号")]
- public string PREP_LINE { get; set; }
+ public string ORDER_LINE { get; set; }
/// <summary>
/// 物料编码
/// </summary>
@@ -44,10 +44,10 @@
[DisplayName("替代料，多个用“'”分隔")]
public string SUBITEM_CODE { get; set; }
/// <summary>
- /// 单位用量
+ /// 单位
/// </summary>
- [DisplayName("单位用量")]
- public double UNIT_QTY { get; set; }
+ [DisplayName("单位")]
+ public double UNIT { get; set; }
/// <summary>
/// 生产计划损耗比例(%)
/// </summary>
@@ -89,20 +89,25 @@
[DisplayName("状态(0UnCalc未计算|1FistrLack首套缺料|2SupplyLack补料缺料|3Enough满足需求|4NoCalc不参与备料计算|5Cancel已作废|6Finish备料完成)")]
public int STATUS { get; set; }
/// <summary>
+ /// 单位用量
+ /// </summary>
+ [DisplayName("单位用量")]
+ public double QTY_UNIT { get; set; }
+ /// <summary>
/// 需求数量
/// </summary>
[DisplayName("需求数量")]
- public double REQ_QTY { get; set; }
+ public double QTY_REQ { get; set; }
/// <summary>
/// 已备料数量
/// </summary>
[DisplayName("已备料数量")]
- public double PREP_QTY { get; set; }
+ public double QTY_PREP { get; set; }
/// <summary>
/// 发出数量
/// </summary>
[DisplayName("发出数量")]
- public double DLVY_QTY { get; set; }
+ public double QTY_DLVY { get; set; }
/// <summary>
/// 工厂编码
/// </summary>
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_SN.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_SN.cs
index 8976a4c..9ce7559 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_SN.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP_SN.cs
@@ -27,46 +27,46 @@
/// 备料单号
/// </summary>
[DisplayName("备料单号")]
- public string PREP_NO { get; set; }
+ public string ORDER_NO { get; set; }
/// <summary>
/// 备料单行号
/// </summary>
[DisplayName("备料单行号")]
- public string PREP_LINE { get; set; }
+ public string ORDER_LINE { get; set; }
/// <summary>
- /// 货物标签
+ /// 物品标签
/// </summary>
- [DisplayName("货物标签")]
+ [DisplayName("物品标签")]
public string SN { get; set; }
/// <summary>
- /// 物料编码
+ /// 物品编码
/// </summary>
- [DisplayName("物料编码")]
+ [DisplayName("物品编码")]
public string ITEM_CODE { get; set; }
- /// <summary>
- /// 物料数量
- /// </summary>
- [DisplayName("物料数量")]
- public double QTY { get; set; }
/// <summary>
/// 单位
/// </summary>
[DisplayName("单位")]
- public string UNIT { get; set; }
+ public double UNIT { get; set; }
+ /// <summary>
+ /// 物品数量
+ /// </summary>
+ [DisplayName("物品数量")]
+ public string QTY { get; set; }
/// <summary>
/// 单位用量
/// </summary>
[DisplayName("单位用量")]
- public double UNIT_QTY { get; set; }
+ public double QTY_UNIT { get; set; }
/// <summary>
/// 发出数量
/// </summary>
[DisplayName("发出数量")]
- public double DLVY_QTY { get; set; }
+ public double QTY_DLVY { get; set; }
/// <summary>
- /// 状态(0Init初始化|1WaitPick待拣料|2OffShelf已下架|3Picked已捡料|4Sended已发料|5Cancel作废)
+ /// 状态(同WMS_ITEM状态)
/// </summary>
- [DisplayName("状态(0Init初始化|1WaitPick待拣料|2OffShelf已下架|3Picked已捡料|4Sended已发料|5Cancel作废)")]
+ [DisplayName("状态(同WMS_ITEM状态)")]
public int STATUS { get; set; }
/// <summary>
/// 发料仓库
@@ -211,25 +211,6 @@
Enum1,
}
*/
-
- /// <summary>
- /// 枚举：状态(0Init初始化|1WaitPick待拣料|2OffShelf已下架|3Picked已捡料|4Sended已发料|5Cancel作废)
- /// </summary>
- public enum STATUSs
- {
- [Description("初始化")]
- Init = 0,
- [Description("待拣料")]
- WaitPick = 1,
- [Description("已下架")]
- OffShelf = 2,
- [Description("已捡料")]
- Picked = 3,
- [Description("已发料")]
- Sended = 4,
- [Description("作废")]
- Cancel = 5,
- }
#endregion
#region 公共方法
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER.cs
index b6441f0..b39a1d8 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER.cs
@@ -10,105 +10,94 @@
/// 瀹炰綋锛氳皟鎷ㄥ崟(WMS)
/// </summary>
[Description("Primary:ID")]
+ [DisplayName("璋冩嫧鍗�(WMS)")]
[Serializable]
[SugarTable("BIZ_WMS_TRANSFER")]
public class BIZ_WMS_TRANSFER : DbEntityWithAuth
{
#region 鏋勯�犲嚱鏁�
-
/// <summary>
/// 瀹炰綋锛氳皟鎷ㄥ崟(WMS)
/// </summary>
- public BIZ_WMS_TRANSFER()
- { }
-
- #endregion 鏋勯�犲嚱鏁�
+ public BIZ_WMS_TRANSFER() { }
+ #endregion
#region 鍏叡灞炴��
-
/// <summary>
- /// 鍗曟嵁浠ｇ爜
+ /// 璋冩嫧鍗曞彿
/// </summary>
- public string BILLCODE { get; set; }
-
+ [DisplayName("璋冩嫧鍗曞彿")]
+ public string ORDER_NO { get; set; }
/// <summary>
/// 鍗曟嵁鏃ユ湡
/// </summary>
- public DateTime BILLDATE { get; set; } = DateTime.MinValue;
-
+ [DisplayName("鍗曟嵁鏃ユ湡")]
+ public DateTime ORDER_DATE { get; set; } = DateTime.MinValue;
/// <summary>
- /// 鍗曟嵁鐘舵��
+ /// 鐘舵��(0Init鏂板垱寤簗1Imported宸插鍏2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸茶皟鍑簗6Arrived宸查�佽揪|7Counting娓呯偣涓瓅8InQC妫�楠屼腑|9Storing涓婃灦涓瓅10Finished宸插畬鎴恷11Cancel浣滃簾)
/// </summary>
+ [DisplayName("鐘舵��(0Init鏂板垱寤簗1Imported宸插鍏2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸茶皟鍑簗6Arrived宸查�佽揪|7Counting娓呯偣涓瓅8InQC妫�楠屼腑|9Storing涓婃灦涓瓅10Finished宸插畬鎴恷11Cancel浣滃簾)")]
public int STATUS { get; set; }
-
/// <summary>
- /// 涓氬姟绫诲瀷
+ /// 璋冨嚭浠撳簱
/// </summary>
- public string BIZTYPE { get; set; }
-
+ [DisplayName("璋冨嚭浠撳簱")]
+ public string OUT_WH_CODE { get; set; }
/// <summary>
- /// 鍑哄簱浠撳簱浠ｇ爜
+ /// 鎷ㄥ叆浠撳簱
/// </summary>
- public string OUTWAREHOUSECODE { get; set; }
-
+ [DisplayName("鎷ㄥ叆浠撳簱")]
+ public string IN_WH_CODE { get; set; }
/// <summary>
- /// 鍏ュ簱搴撲粨搴撲唬鐮�
+ /// 鏉ユ簮鍗曟嵁缂栫爜锛屽涓敤鈥�'鈥濆垎闅�
/// </summary>
- public string INWAREHOUSECODE { get; set; }
-
+ [DisplayName("鏉ユ簮鍗曟嵁缂栫爜锛屽涓敤鈥�'鈥濆垎闅�")]
+ public string SOURCE_CODE { get; set; }
/// <summary>
- /// 鏉ユ簮鍗曟嵁绫诲瀷
+ /// 鏉ユ簮鍗曞彿锛屽涓敤鈥�'鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲
/// </summary>
- public int SOURCETYPE { get; set; }
-
+ [DisplayName("鏉ユ簮鍗曞彿锛屽涓敤鈥�'鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲")]
+ public string SOURCE_ORDER { get; set; }
/// <summary>
- /// 鏉ユ簮鍗曟嵁浠ｇ爜
+ /// ERP鍗曟嵁鍙风爜
/// </summary>
- public string SOURCECODE { get; set; }
-
+ [DisplayName("ERP鍗曟嵁鍙风爜")]
+ public string ERP_ORDER { get; set; }
/// <summary>
/// 澶囨敞
/// </summary>
+ [DisplayName("澶囨敞")]
public string REMARK { get; set; }
-
- /// <summary>
- /// ERP鍗曟嵁浠ｇ爜
- /// </summary>
- public string ERP_BILL_CODE { get; set; }
-
/// <summary>
/// -1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟
/// </summary>
+ [DisplayName("-1:鏈鐞嗭紝0:鍚屾澶勭悊瀹岋紝>0:鍚屾澶勭悊澶辫触娆℃暟")]
public int HANDLED { get; set; }
-
/// <summary>
/// 鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈�
/// </summary>
+ [DisplayName("鏈�鍚庝竴娆″悓姝ュ鐞嗘棩鏈�")]
public DateTime HANDLED_DATE { get; set; } = DateTime.MinValue;
-
/// <summary>
/// 杩囪处鎻愪氦鐨凧SON
/// </summary>
+ [DisplayName("杩囪处鎻愪氦鐨凧SON")]
public string COMMIT_JSON { get; set; }
-
/// <summary>
/// 杩囪处鎻愪氦鐨勮繑鍥炰俊鎭�
/// </summary>
+ [DisplayName("杩囪处鎻愪氦鐨勮繑鍥炰俊鎭�")]
public string COMMIT_MSG { get; set; }
-
- #endregion 鍏叡灞炴��
+ #endregion
#region 铏氭嫙灞炴��
-
/*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
-
- #endregion 铏氭嫙灞炴��
+ #endregion
#region 澶栭敭灞炴��
-
/*渚嬪瓙
//涓�瀵逛竴澶栭敭瀵艰埅
[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_WMS_TRANSFER绫婚噷闈㈢殑澶栭敭ID瀛楁
@@ -121,13 +110,13 @@
public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
*/
- [Navigate(NavigateType.OneToMany, nameof(BIZ_WMS_TRANSFER_DTL.BILLCODE), nameof(BILLCODE))]
+ [Navigate(NavigateType.OneToMany, nameof(BIZ_WMS_TRANSFER_DTL.ORDER_NO), nameof(ORDER_NO))]
public List<BIZ_WMS_TRANSFER_DTL> DtlsWithGhost { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
[SugarColumn(IsIgnore = true)]
public List<BIZ_WMS_TRANSFER_DTL> Dtls => DtlsWithGhost?.Where(q => !q.GHOST_ROW).ToList();
- [Navigate(NavigateType.OneToMany, nameof(BIZ_WMS_TRANSFER_SN.BILLCODE), nameof(BILLCODE))]
+ [Navigate(NavigateType.OneToMany, nameof(BIZ_WMS_TRANSFER_SN.ORDER_NO), nameof(ORDER_NO))]
public List<BIZ_WMS_TRANSFER_SN> SnListWithGhost { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
[SugarColumn(IsIgnore = true)]
@@ -136,73 +125,50 @@
#endregion 澶栭敭灞炴��
#region 鏋氫妇鍙橀噺
-
/*渚嬪瓙
- public enum FieldNames
- {
- [Description("鏋氫妇鎻忚堪0")]
- Enum0,
- [Description("鏋氫妇鎻忚堪1")]
- Enum1,
- }
- */
-
+ public enum FieldNames
+ {
+ [Description("鏋氫妇鎻忚堪0")]
+ Enum0,
+ [Description("鏋氫妇鎻忚堪1")]
+ Enum1,
+ }
+ */
+ /// <summary>
+ /// 鏋氫妇锛氱姸鎬�(0Init鏂板垱寤簗1Imported宸插鍏2WaitPick寰呮崱鏂檤3Picking鎹℃枡涓瓅4Picked宸叉崱瀹寍5Sended宸茶皟鍑簗6Arrived宸查�佽揪|7Counting娓呯偣涓瓅8InQC妫�楠屼腑|9Storing涓婃灦涓瓅10Finished宸插畬鎴恷11Cancel浣滃簾)
+ /// </summary>
public enum STATUSs
{
- /// <summary>
- ///
- /// </summary>
- [Description("鎵嬪伐鏂板")]
- MANUAL = -1,
-
- /// <summary>
- ///
- /// </summary>
- [Description("鏂板")]
- INIT,
-
- /// <summary>
- ///
- /// </summary>
- [Description("浣滀笟涓�")]
- WORKING,
-
- /// <summary>
- ///
- /// </summary>
- [Description("瀹屾垚")]
- COMPLETE,
-
- /// <summary>
- /// 棰嗘枡鍗曚富鍔ㄨ皟鎷ㄨ繃璐︾姸鎬�
- /// </summary>
- [Description("璋冩嫧瀹屾垚")]
- FINISHED,
-
- /// <summary>
- /// 鎵嬪姩涓嬫灦瀹屾垚
- /// </summary>
- [Description("鎵嬪姩涓嬫灦瀹屾垚")]
- MANUALCOMPLETE,
-
- /// <summary>
- /// 璋冨嚭
- /// </summary>
- [Description("璋冨嚭")]
- OUTERCOMPLETE,
+ [Description("鏂板垱寤�")]
+ Init = 0,
+ [Description("宸插鍏�")]
+ Imported = 1,
+ [Description("寰呮崱鏂�")]
+ WaitPick = 2,
+ [Description("鎹℃枡涓�")]
+ Picking = 3,
+ [Description("宸叉崱瀹�")]
+ Picked = 4,
+ [Description("宸茶皟鍑�")]
+ Sended = 5,
+ [Description("宸查�佽揪")]
+ Arrived = 6,
+ [Description("娓呯偣涓�")]
+ Counting = 7,
+ [Description("妫�楠屼腑")]
+ InQC = 8,
+ [Description("涓婃灦涓�")]
+ Storing = 9,
+ [Description("宸插畬鎴�")]
+ Finished = 10,
+ [Description("浣滃簾")]
+ Cancel = 11,
}
-
- #endregion 鏋氫妇鍙橀噺
+ #endregion
#region 鍏叡鏂规硶
- public static List<string> strongHoldList = new List<string>
- {
- "XCSJ",
- "DGXC",
- "AHXC"
- };
+ #endregion
- #endregion 鍏叡鏂规硶
}//endClass
}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER_DTL.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER_DTL.cs
index 8b0f219..423fc60 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER_DTL.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER_DTL.cs
@@ -10,6 +10,7 @@
/// 瀹炰綋锛氳皟鎷ㄥ崟(WMS)鏄庣粏
/// </summary>
[Description("Primary:ID")]
+ [DisplayName("璋冩嫧鍗�(WMS)鏄庣粏")]
[Serializable]
[SugarTable("BIZ_WMS_TRANSFER_DTL")]
public class BIZ_WMS_TRANSFER_DTL : DbEntityWithAuth
@@ -23,88 +24,101 @@
#region 鍏叡灞炴��
/// <summary>
- /// 鍗曟嵁浠ｇ爜
+ /// 璋冩嫧鍗曞彿
/// </summary>
- public string BILLCODE { get; set; }
+ [DisplayName("璋冩嫧鍗曞彿")]
+ public string ORDER_NO { get; set; }
/// <summary>
- /// 鍗曟嵁琛屽彿
+ /// 璋冩嫧鍗曡鍙�
/// </summary>
- public string BILLLINE { get; set; }
+ [DisplayName("璋冩嫧鍗曡鍙�")]
+ public string ORDER_LINE { get; set; }
/// <summary>
/// 鍗曟嵁琛岀姸鎬�
/// </summary>
- public int LINESTATUS { get; set; }
+ [DisplayName("鍗曟嵁琛岀姸鎬�")]
+ public int STATUS { get; set; }
/// <summary>
/// 鐗╂枡缂栫爜
/// </summary>
+ [DisplayName("鐗╂枡缂栫爜")]
public string ITEM_CODE { get; set; }
/// <summary>
- /// 鍗曚綅浠ｇ爜
+ /// 鍗曚綅
/// </summary>
- public string UNITCODE { get; set; }
+ [DisplayName("鍗曚綅")]
+ public string UNIT { get; set; }
/// <summary>
/// 闇�姹傛暟閲�
/// </summary>
- public double PRQTY { get; set; }
+ [DisplayName("闇�姹傛暟閲�")]
+ public double QTY_REQ { get; set; }
/// <summary>
- /// 鍑哄簱鏁伴噺
+ /// 璋冨嚭鏁伴噺
/// </summary>
- public double OUTQTY { get; set; }
+ [DisplayName("璋冨嚭鏁伴噺")]
+ public double QTY_OUT { get; set; }
/// <summary>
- /// 鍏ュ簱鏁伴噺
+ /// 鎷ㄥ叆鏁伴噺
/// </summary>
- public double INQTY { get; set; }
+ [DisplayName("鎷ㄥ叆鏁伴噺")]
+ public double QTY_IN { get; set; }
/// <summary>
- /// 鍑哄簱浠撳簱浠ｇ爜
+ /// 璋冨嚭浠撳簱
/// </summary>
- public string OUTWAREHOUSECODE { get; set; }
+ [DisplayName("璋冨嚭浠撳簱")]
+ public string OUT_WH_CODE { get; set; }
/// <summary>
- /// 鍏ュ簱浠撳簱浠ｇ爜
+ /// 鎷ㄥ叆浠撳簱
/// </summary>
- public string INWAREHOUSECODE { get; set; }
+ [DisplayName("鎷ㄥ叆浠撳簱")]
+ public string IN_WH_CODE { get; set; }
/// <summary>
- /// 鏉ユ簮鍗曟嵁绫诲瀷
+ /// 鎷ㄥ嚭鎵瑰彿
/// </summary>
- public int SOURCETYPE { get; set; }
+ [DisplayName("鎷ㄥ嚭鎵瑰彿")]
+ public string OUT_LOTNO { get; set; }
/// <summary>
- /// 鏉ユ簮鍗曟嵁浠ｇ爜
+ /// 鎷ㄥ叆鎵瑰彿
/// </summary>
- public string SOURCECODE { get; set; }
+ [DisplayName("鎷ㄥ叆鎵瑰彿")]
+ public string IN_LOTNO { get; set; }
/// <summary>
- /// 鏉ユ簮鍗曟嵁琛屽彿
+ /// 鏉ユ簮鍗曟嵁缂栫爜锛屽涓敤鈥�'鈥濆垎闅�
/// </summary>
- public string SOURCELINE { get; set; }
+ [DisplayName("鏉ユ簮鍗曟嵁缂栫爜锛屽涓敤鈥�'鈥濆垎闅�")]
+ public string SOURCE_CODE { get; set; }
+ /// <summary>
+ /// 鏉ユ簮鍗曞彿锛屽涓敤鈥�'鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲
+ /// </summary>
+ [DisplayName("鏉ユ簮鍗曞彿锛屽涓敤鈥�'鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲")]
+ public string SOURCE_ORDER { get; set; }
+ /// <summary>
+ /// 鏉ユ簮鍗曡鍙凤紝澶氫釜鐢ㄢ��'鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲
+ /// </summary>
+ [DisplayName("鏉ユ簮鍗曡鍙凤紝澶氫釜鐢ㄢ��'鈥濆垎闅旓紝璺熺紪鐮佷竴涓�瀵瑰簲")]
+ public string SOURCE_LINE { get; set; }
+ /// <summary>
+ /// ERP鍗曟嵁鍙风爜
+ /// </summary>
+ [DisplayName("ERP鍗曟嵁鍙风爜")]
+ public string ERP_ORDER { get; set; }
/// <summary>
/// 澶囨敞
/// </summary>
+ [DisplayName("澶囨敞")]
public string REMARK { get; set; }
- /// <summary>
- /// ERP鍗曟嵁浠ｇ爜
- /// </summary>
- public string ERP_BILL_CODE { get; set; }
- /// <summary>
- /// 搴撳瓨鏁伴噺
- /// </summary>
- public double INVENTORYQTY { get; set; } = 0;
- /// <summary>
- /// 鎷ㄥ叆鎵瑰彿
- /// </summary>
- public string BATCH_NO_IN { get; set; }
- /// <summary>
- /// 鎷ㄥ嚭鎵瑰彿
- /// </summary>
- public string BATCH_NO_OUT { get; set; }
- #endregion
+ #endregion
- #region 铏氭嫙灞炴��
- /*渚嬪瓙
+ #region 铏氭嫙灞炴��
+ /*渚嬪瓙
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 澶栭敭灞炴��
- /*渚嬪瓙
+ #region 澶栭敭灞炴��
+ /*渚嬪瓙
//涓�瀵逛竴澶栭敭瀵艰埅
[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_WMS_TRANSFER_DTL绫婚噷闈㈢殑澶栭敭ID瀛楁
public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
@@ -121,8 +135,8 @@
public BAS_ITEM ItemInfo => _ItemInfos?.FirstOrDefault(q => q.AUTH_ORG == AUTH_ORG);
#endregion
- #region 鏋氫妇鍙橀噺
- /*渚嬪瓙
+ #region 鏋氫妇鍙橀噺
+ /*渚嬪瓙
public enum FieldNames
{
[Description("鏋氫妇鎻忚堪0")]
@@ -131,11 +145,11 @@
Enum1,
}
*/
- #endregion
+ #endregion
- #region 鍏叡鏂规硶
+ #region 鍏叡鏂规硶
- #endregion
+ #endregion
- }//endClass
+ }//endClass
}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER_SN.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER_SN.cs
index 13797c2..c0d386d 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER_SN.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_TRANSFER_SN.cs
@@ -7,91 +7,145 @@
namespace Tiger.Model
{
/// <summary>
- /// 瀹炰綋锛氳皟鎷ㄥ崟(WMS)鏉＄爜鏄庣粏
+ /// 实体：调拨单(WMS)条码明细
/// </summary>
[Description("Primary:ID")]
+ [DisplayName("调拨单(WMS)条码明细")]
[Serializable]
[SugarTable("BIZ_WMS_TRANSFER_SN")]
public class BIZ_WMS_TRANSFER_SN : DbEntityWithAuth
{
- #region 鏋勯�犲嚱鏁�
+ #region 构造函数
/// <summary>
- /// 瀹炰綋锛氳皟鎷ㄥ崟(WMS)鏉＄爜鏄庣粏
+ /// 实体：调拨单(WMS)条码明细
/// </summary>
public BIZ_WMS_TRANSFER_SN() {}
#endregion
- #region 鍏叡灞炴��
+ #region 公共属性
/// <summary>
- /// 鏉＄爜
+ /// 调拨单号
/// </summary>
+ [DisplayName("调拨单号")]
+ public string ORDER_NO { get; set; }
+ /// <summary>
+ /// 调拨单行号
+ /// </summary>
+ [DisplayName("调拨单行号")]
+ public string ORDER_LINE { get; set; }
+ /// <summary>
+ /// 条码
+ /// </summary>
+ [DisplayName("条码")]
public string SN { get; set; }
- /// <summary>
- /// 鍏冩潯鐮�
- /// </summary>
- public string META_SN { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string ITEM_CODE { get; set; }
/// <summary>
- /// 鏁伴噺
+ /// 状态(同WMS_ITEM状态)
/// </summary>
+ [DisplayName("状态(同WMS_ITEM状态)")]
+ public int STATUS { get; set; }
+ /// <summary>
+ /// 物料编码
+ /// </summary>
+ [DisplayName("物料编码")]
+ public string ITEM_CODE { get; set; }
+ /// <summary>
+ /// 数量
+ /// </summary>
+ [DisplayName("数量")]
public double QTY { get; set; }
/// <summary>
- /// 鍗曟嵁浠ｇ爜
+ /// 调出仓库
/// </summary>
- public string BILLCODE { get; set; }
+ [DisplayName("调出仓库")]
+ public string OUT_WH_CODE { get; set; }
/// <summary>
- /// 鍗曟嵁鏃ユ湡
+ /// 调出储区
/// </summary>
- public DateTime BILLDATE { get; set; } = DateTime.MinValue;
+ [DisplayName("调出储区")]
+ public string OUT_REGION_CODE { get; set; }
/// <summary>
- /// 鍗曟嵁琛屽彿
+ /// 调出货架
/// </summary>
- public string BILLLINE { get; set; }
- /// <summary>
- /// 鍗曟嵁鐘舵��
- /// </summary>
- public int STATUS { get; set; }
- #endregion
+ [DisplayName("调出货架")]
+ public string OUT_SHELF_CODE { get; set; }
+ /// <summary>
+ /// 调出储位
+ /// </summary>
+ [DisplayName("调出储位")]
+ public string OUT_LOCATION_CODE { get; set; }
+ /// <summary>
+ /// 调出时间
+ /// </summary>
+ [DisplayName("调出时间")]
+ public DateTime OUT_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 拨入仓库
+ /// </summary>
+ [DisplayName("拨入仓库")]
+ public string IN_WH_CODE { get; set; }
+ /// <summary>
+ /// 拨入储区
+ /// </summary>
+ [DisplayName("拨入储区")]
+ public string IN_REGION_CODE { get; set; }
+ /// <summary>
+ /// 拨入货架
+ /// </summary>
+ [DisplayName("拨入货架")]
+ public string IN_SHELF_CODE { get; set; }
+ /// <summary>
+ /// 拨入储位
+ /// </summary>
+ [DisplayName("拨入储位")]
+ public string IN_LOCATION_CODE { get; set; }
+ /// <summary>
+ /// 拨入时间
+ /// </summary>
+ [DisplayName("拨入时间")]
+ public DateTime IN_TIME { get; set; } = DateTime.MinValue;
+ /// <summary>
+ /// 备注
+ /// </summary>
+ [DisplayName("备注")]
+ public string REMARK { get; set; }
+ #endregion
- #region 铏氭嫙灞炴��
- /*渚嬪瓙
+ #region 虚拟属性
+ /*例子
[SugarColumn(IsIgnore = true)]
public string FieldName { get; set; }
*/
- #endregion
+ #endregion
- #region 澶栭敭灞炴��
- /*渚嬪瓙
- //涓�瀵逛竴澶栭敭瀵艰埅
- [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//涓�瀵逛竴 ClassAId鏄疊IZ_WMS_TRANSFER_SN绫婚噷闈㈢殑澶栭敭ID瀛楁
- public ClassA ClassA { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
- //涓�瀵瑰澶栭敭瀵艰埅
- [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_WMS_TRANSFER_SNId))]//ClassA琛ㄤ腑鐨凚IZ_WMS_TRANSFER_SNId
- public List<ClassA> ClassAList { get; set; }//娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
- //澶氬澶氬閿鑸�
- [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_WMS_TRANSFER_SNId), nameof(MappingClass.ClassAId))]//娉ㄦ剰椤哄簭
- public List<ClassA> ClassAList { get; set; } //娉ㄦ剰绂佹鎵嬪姩璧嬪�硷紝鍙兘鏄痭ull
+ #region 外键属性
+ /*例子
+ //一对一外键导航
+ [Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_WMS_TRANSFER_SN类里面的外键ID字段
+ public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+ //一对多外键导航
+ [Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_WMS_TRANSFER_SNId))]//ClassA表中的BIZ_WMS_TRANSFER_SNId
+ public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+ //多对多外键导航
+ [Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_WMS_TRANSFER_SNId), nameof(MappingClass.ClassAId))]//注意顺序
+ public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
*/
- #endregion
+ #endregion
- #region 鏋氫妇鍙橀噺
- /*渚嬪瓙
+ #region 枚举变量
+ /*例子
public enum FieldNames
{
- [Description("鏋氫妇鎻忚堪0")]
+ [Description("枚举描述0")]
Enum0,
- [Description("鏋氫妇鎻忚堪1")]
+ [Description("枚举描述1")]
Enum1,
}
*/
- #endregion
+ #endregion
- #region 鍏叡鏂规硶
+ #region 公共方法
- #endregion
+ #endregion
- }//endClass
+ }//endClass
}
\ No newline at end of file
--
Gitblit v1.9.3