From fe4a8ec610b23d33c697dbb76c298ff3b2e31ef1 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 29 四月 2025 01:14:39 +0800
Subject: [PATCH] 来料打印更新
---
Tiger.Business.WMS/T100ToWMS/MaterialInfoBusiness.cs | 120 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/Tiger.Business.WMS/T100ToWMS/MaterialInfoBusiness.cs b/Tiger.Business.WMS/T100ToWMS/MaterialInfoBusiness.cs
index 55b2af9..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
}
}
@@ -577,7 +577,7 @@
MailTextBody = $"Hi All锛�<br/><br/> {orderType}[{model.payload.std_data.parameter.indc008}]璋冩嫧涓诲姩杩囪处澶辫触锛�<br/> T100杩斿洖娑堟伅锛歿result.payload.std_data.execution.description}",
MailBodyType = "Html",
MailFilePath = null,
- Recipients = Biz.SysParam.Params.Where(q => q.PRMG_CODE == "PickingEmailGroup").Select(q => q.PARAM_VALUE).ToList(), // new List<string> { "ben.lin@tigerclouds.com", "dyfang@sharetronic.com", "dianzicang@sharetronic.com" },
+ Recipients = Cache.SysParam.Params.Where(q => q.PRMG_CODE == "PickingEmailGroup").Select(q => q.PARAM_VALUE).ToList(), // new List<string> { "ben.lin@tigerclouds.com", "dyfang@sharetronic.com", "dianzicang@sharetronic.com" },
Cc = new List<string>(),
Sender = "WMS Email Admin",
SenderAddress = "xcerp@sharetronic.com",
@@ -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
});
@@ -1275,7 +1275,7 @@
BILLTYPE = Convert.ToInt32(item.pmdldoctype),
//STATUS = Convert.ToInt32(item.pmdlstus), // 鐘舵�佹棤娉曡浆鎹�
CURRENCY = item.pmdl015,
- EXCHANGERATE = item.pmdl016.ToDecimal(),
+ EXCHANGERATE = item.pmdl016.ToDouble(),
PURDEPTCODE = item.pmdl003,
PUREMPLOYEECODE = item.pmdl002,
SUPPLIERCODE = item.pmdl004,
@@ -1883,7 +1883,7 @@
PROD_DATE = a.PROD_DATE,
VALIDITY_DAYS = b.VALIDITY_DAYS,
DepositDays = b.DepositDays,
- PostponeDays = a.PostponeDays
+ //PostponeDays = a.PostponeDays
}).ToList();
#endregion 鑾峰彇鎵�鏈夌殑鏉＄爜鏈夋晥鏈熶俊鎭�
@@ -1922,7 +1922,7 @@
MailTextBody = "浠ヤ笅鐗╂枡棰勮秴鏈燂紝璇峰強鏃跺鐞嗭紒<br/><br/>" + string.Join(" ", msg),
MailBodyType = "Html",
MailFilePath = null,
- Recipients = Biz.SysParam.Params.Where(q => q.PRMG_CODE == "MaterialExtended").Select(q => q.PARAM_VALUE).ToList(),
+ Recipients = Cache.SysParam.Params.Where(q => q.PRMG_CODE == "MaterialExtended").Select(q => q.PARAM_VALUE).ToList(),
Cc = new List<string>(),
Sender = "WMS Email Admin",
SenderAddress = "xcerp@sharetronic.com",
--
Gitblit v1.9.3