From 4e7803e64656655103a96c4e426bf1bf2563e3f7 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 24 十月 2024 11:26:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs | 21 ++++++++++
Tiger.IBusiness.MES/BIZ/IMES_WO.cs | 1
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 54 +++++++++++++++++++++++---
Tiger.Model.Net/Entitys/MES/ParameterEntity/BizMesWoParameter.cs | 9 ++++
4 files changed, 78 insertions(+), 7 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index a9e64a7..b62afc1 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -329,27 +329,34 @@
try
{
//淇濆瓨鍓嶇殑鍒ゆ柇
- if (input.WORK_ORDER.IsNullOrEmpty())
+ if (input.WORK_ORDER.IsNullOrEmpty() && input.PROD_CODE.IsNullOrEmpty())
{
result.IsSuccessed = false;
- result.LocaleMsg = new($"宸ュ崟鍙蜂笉鑳戒负绌猴紒");
+ result.LocaleMsg = new($"宸ュ崟鍙锋垨鑰呬骇鍝佺紪鐮佷笉鑳戒负绌猴紒");
return result;
}
List<BAS_LABEL_VAR_WO> varWoList = new();
string imageFileName = Path.GetFileNameWithoutExtension(input.LABEL_VIEW_PATH);
- string path = @$"{BizConfig.Configuration["UploadAddress"]}//Upload/Template//Temp//{ imageFileName}.png";
+ string path = @$"{BizConfig.Configuration["UploadAddress"]}//Upload/Template//Temp//{imageFileName}.png";
if (File.Exists(path))
{
- varWoList = await Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(x => x.LABEL_ID == input.LABEL_ID && x.WORK_ORDER == input.WORK_ORDER).ToListAsync();
- foreach (var item in varWoList) {
+ varWoList = await Biz.Db.Queryable<BAS_LABEL_VAR_WO>()
+ .Where(x => x.LABEL_ID == input.LABEL_ID)
+ .WhereIF(!input.WORK_ORDER.IsNullOrEmpty(), x => x.WORK_ORDER == input.WORK_ORDER)
+ .WhereIF(!input.PROD_CODE.IsNullOrEmpty(), x => x.PROD_CODE == input.PROD_CODE)
+ .ToListAsync();
+ foreach (var item in varWoList)
+ {
item.LABEL_VIEW_PATH = $"{BizConfig.Configuration["DownloadAddress"]}//Template//Temp//{imageFileName}.png";
}
}
var db = Biz.Db;
var dbTran = db.UseTran(() =>
{
+ Expression<Func<BAS_LABEL_VAR_WO, object>> predicate = !input.WORK_ORDER.IsNullOrEmpty() ? t => new { t.LABEL_ID, t.WORK_ORDER, t.VAR_NAME, t.GHOST_ROW } :
+ !input.PROD_CODE.IsNullOrEmpty() ? t => new { t.LABEL_ID, t.PROD_CODE, t.VAR_NAME, t.GHOST_ROW } : t => new { t.LABEL_ID, t.VAR_NAME, t.GHOST_ROW };
var y = db.Storageable(input)
- .WhereColumns(t => new { t.LABEL_ID, t.WORK_ORDER, t.VAR_NAME, t.GHOST_ROW })
+ .WhereColumns(predicate)
.ToStorage();
y.AsInsertable.ExecuteCommand();
y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
@@ -403,7 +410,7 @@
var queryable = Biz.Db.Queryable<BAS_LABEL_VAR_WO>()
.Where(q => q.LABEL_ID.Equals(labeltemp.ID))
.WhereIF(!input.WorkOrder.IsNullOrEmpty(), q => q.WORK_ORDER.Equals(input.WorkOrder))
- .WhereIF(!input.ProdCode.IsNullOrEmpty(), q=>q.PROD_CODE.Equals(input.ProdCode))
+ .WhereIF(!input.ProdCode.IsNullOrEmpty(), q => q.PROD_CODE.Equals(input.ProdCode))
.WhereIF(!input.CustCode.IsNullOrEmpty(), q => q.PROD_CODE.Equals(input.CustCode));
query.page = await queryable.ToPageAsync(input.page, input.pageSize);
//濡傛灉涓嶅瓨鍦紝鍒欒繑鍥炲垵濮嬫暟鎹�
@@ -426,6 +433,7 @@
var list = queryable.ToList().Where(q => q.VAR_NAME == item.VAR_NAME).First();
item.ID = list?.ID;
item.WORK_ORDER = input.WorkOrder;
+ item.PROD_CODE = input.ProdCode;
item.VAR_VALUE = list?.VAR_VALUE;
item.LABEL_VIEW_PATH = list?.LABEL_VIEW_PATH;
}
@@ -442,5 +450,37 @@
}
return result;
}
+
+ /// <summary>
+ /// 鑾峰彇閲嶆墦鏍囩淇℃伅
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
+ public async Task<ApiAction<LOG_LABEL_PRINT>> GetRePrintInfo(RePrintInput input)
+ {
+ var result = new ApiAction<LOG_LABEL_PRINT>();
+ try
+ {
+ //鍏堟煡鍑哄伐鍗曟潯鐮佷腑鏄惁瀛樺湪
+ var woSn = await Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q => q.SN.Equals(input.Code) || q.FLOW_SN.Equals(input.Code)).FirstAsync();
+ if (woSn == null)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"鏉＄爜涓嶅瓨鍦紒");
+ return result;
+ }
+
+ result.Data = await Biz.Db.Queryable<LOG_LABEL_PRINT>()
+ .WhereIF(input.ReqType == 0, q => q.SN.Equals(input.Code)) //鐧界洅鏍囩
+ .WhereIF(input.ReqType == 1, q => q.SN.Equals(woSn.OUTER_SN)) //绠辨爣绛�
+ .FirstAsync();
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "鑾峰彇閲嶆墦鏍囩淇℃伅寮傚父");
+ }
+ return result;
+ }
}
}
diff --git a/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs b/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
index 45acf6e..bf78085 100644
--- a/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
+++ b/Tiger.Controllers.MES/Controllers/MESController.BIZ_MES_WO.cs
@@ -161,6 +161,27 @@
}
/// <summary>
+ /// 鑾峰彇閲嶆墦鏍囩淇℃伅
+ /// </summary>
+ /// <param name="action"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("api/[controller]/[action]")]
+ public async Task<IActionResult> GetRePrintInfo([FromBody] ApiAction<RePrintInput> action)
+ {
+ ApiAction response = new();
+ try
+ {
+ response = response.GetResponse(await DI.Resolve<IBIZ_MES_WO>().GetRePrintInfo(action.Data));
+ }
+ catch (System.Exception ex)
+ {
+ response = response.GetResponse().CatchExceptionWithLog(ex);
+ }
+ return Ok(response);
+ }
+
+ /// <summary>
/// 鑾峰彇宸ュ崟鎵规鐨勬暟閲忔眹鎬�
/// </summary>
/// <param name="batch"></param>
diff --git a/Tiger.IBusiness.MES/BIZ/IMES_WO.cs b/Tiger.IBusiness.MES/BIZ/IMES_WO.cs
index a88660d..de12899 100644
--- a/Tiger.IBusiness.MES/BIZ/IMES_WO.cs
+++ b/Tiger.IBusiness.MES/BIZ/IMES_WO.cs
@@ -20,5 +20,6 @@
public Task<ApiAction> UpdateWoBatchStatus(BizMesWoInput input);
public Task<ApiAction> AddOrEditLabelVarByWorkOrder(BAS_LABEL_VAR_WO input);
public Task<ApiAction<QueryAble<BAS_LABEL_VAR_WO>>> GetLabelVarByWorkOrder(BizLabelVarWoInput input);
+ public Task<ApiAction<LOG_LABEL_PRINT>> GetRePrintInfo(RePrintInput input);
}
}
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/BizMesWoParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/BizMesWoParameter.cs
index 8910801..bde9e21 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/BizMesWoParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/BizMesWoParameter.cs
@@ -28,4 +28,13 @@
public int pageSize { get; set; }
}
+
+ public class RePrintInput
+ {
+ /// <summary>
+ /// 璇锋眰绫诲瀷
+ /// </summary>
+ public int ReqType { get; set; }
+ public string Code { get; set; }
+ }
}
--
Gitblit v1.9.3