From 790032df98d586627a771159d5b6c7646e3fff35 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期六, 07 十二月 2024 23:18:29 +0800
Subject: [PATCH] 入库单更新
---
Tiger.Business.MES/iERP/MES_U9C.cs | 40 +++++++++++++---------------------------
1 files changed, 13 insertions(+), 27 deletions(-)
diff --git a/Tiger.Business.MES/iERP/MES_U9C.cs b/Tiger.Business.MES/iERP/MES_U9C.cs
index f173244..15eac1f 100644
--- a/Tiger.Business.MES/iERP/MES_U9C.cs
+++ b/Tiger.Business.MES/iERP/MES_U9C.cs
@@ -47,21 +47,6 @@
{
//鍏堜繚瀛樻暟鎹�
bool IsSuccessed = true;
- var db = Biz.Db;
- var dbTran = db.UseTran(() =>
- {
- var s = db.Storageable(input.ErpProdInBths, "U9C_RcvRptDocCreate")
- .WhereColumns(t => new { t.ORDER_NO, t.WORK_ORDER, t.GHOST_ROW })
- .ToStorage();
- s.AsInsertable.ExecuteCommand();
- s.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
- });
- if (!dbTran.IsSuccess)
- {
- action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
- Logger.Interface.Error(action.Message);
- IsSuccessed = false;
- }
//淇濆瓨鎴愬姛锛岃皟鐢║9C鎺ュ彛-娴嬭瘯鐢�
//int i = 1;
@@ -93,9 +78,9 @@
//{
// _db.Updateable(ErpProdInBths, "U9C_RcvRptDocCreate").UpdateColumns(x => new { x.ORDER_NO, x.REMARK, x.IS_HANDLED, x.HANDLED_DATE }).ExecuteCommand();
//});
- //if (!dbTran.IsSuccess)
+ //if (!_dbTran.IsSuccess)
//{
- // action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
+ // action.CatchExceptionWithLog(_dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
// Logger.Interface.Error(action.Message);
// IsSuccessed = false;
//}
@@ -149,11 +134,11 @@
}
foreach (var p in input.PrintJsons)
{
- var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder && q.STATUS != "P").FirstOrDefault();
+ var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder && q.IS_HANDLED != "P").FirstOrDefault();
if (!d.IsNullOrEmpty())
{
d.ORDER_NO = result.Data[0].m_code;
- d.STATUS = "Y";
+ d.IS_HANDLED = "Y";
}
}
Logger.Interface.Info($"鐢熸垚鍏ュ簱鍗曟垚鍔�");
@@ -172,11 +157,11 @@
}
foreach (var p in input.PrintJsons)
{
- var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder && q.STATUS != "P").FirstOrDefault();
+ var d = p.Items.Where(q => q.WORK_ORDER == item.WorkOrder && q.IS_HANDLED != "P").FirstOrDefault();
if (!d.IsNullOrEmpty())
{
d.ORDER_NO = result.Data[0].m_code;
- d.STATUS = "F";
+ d.IS_HANDLED = "F";
}
}
Logger.Interface.Info($"鐢熸垚鍏ュ簱鍗曞け璐�:{result.Data[0].m_errorMsg}");
@@ -186,11 +171,11 @@
var _db = Biz.Db;
var _dbTran = _db.UseTran(() =>
{
- _db.Updateable(ErpProdInBths, "U9C_RcvRptDocCreate").UpdateColumns(x => new { x.ORDER_NO, x.REMARK, x.IS_HANDLED, x.HANDLED_DATE }).ExecuteCommand();
+ _db.Updateable(ErpProdInBths, "U9C_RcvRptDocCreate").UpdateColumns(x => new { x.ORDER_NO, x.REMARK, x.IS_HANDLED, x.HANDLED_DATE, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
});
- if (!dbTran.IsSuccess)
+ if (!_dbTran.IsSuccess)
{
- action.CatchExceptionWithLog(dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
+ action.CatchExceptionWithLog(_dbTran.ErrorException, $"鏁版嵁澶勭悊澶辫触");
Logger.Interface.Error(action.Message);
IsSuccessed = false;
}
@@ -208,14 +193,15 @@
return action;
}
- private List<BAS_LABEL_TEMP> GetLabels(List<InStorePrintJson> printJsons) {
+ private List<BAS_LABEL_TEMP> GetLabels(List<InStorePrintJson> printJsons)
+ {
List<BAS_LABEL_TEMP> labels = new List<BAS_LABEL_TEMP>();
int i = 1;
int j = 1;
foreach (var p in printJsons)
{
BAS_LABEL_TEMP label = Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == "InstoreTemplate").IncludesAllFirstLayer().First();
- foreach (var v in p.Items.Where(q => q.STATUS != "F" && q.STATUS != "P"))
+ foreach (var v in p.Items.Where(q => q.IS_HANDLED != "F" && q.IS_HANDLED != "P"))
{
foreach (var item in label.Variables)
{
@@ -253,7 +239,7 @@
}
if (item.VAR_NAME == $"BoxQty{j}")
{
- item.Value = v.PLAN_QTY.ToString();
+ item.Value = v.CartonQty.ToString();
}
if (item.VAR_NAME == $"InQty{j}")
{
--
Gitblit v1.9.3