服务端的TigerApi 框架,基于.NET6 2024 版本
Ben Lin
2024-07-31 10f3247a8320da7e1e519c20b8014c65958301c2
模板变量维护更新
已修改5个文件
94 ■■■■■ 文件已修改
Tiger.Api/Controllers/Base/BaseController.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.Api/Controllers/MES/MESController.BAS_LABEL_TEMP.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.Business.MES/LabelTemplate/BAS_LABEL_TEMP.cs 63 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.IBusiness/MES/LabelTemplate/ILabelTemplate.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.Model.Net/Entitys/BAS/BAS_LABEL_VAR_WO.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.Api/Controllers/Base/BaseController.cs
@@ -562,7 +562,7 @@
        {
            if (file == null || file.Length == 0)
                return BadRequest("No file uploaded.");
            var folderName = entityName == "BAS_LABEL_TEMP" ? "upload/Template": "upload";
            var folderName = entityName == "BAS_LABEL_TEMP" || entityName == "BAS_LABEL_VAR" ? "upload/Template": "upload";
            var path = Path.Combine($@"{BizConfig.Configuration["UploadAddress"]}", folderName, file.FileName);
            using (var stream = new FileStream(path, FileMode.Create))
Tiger.Api/Controllers/MES/MESController.BAS_LABEL_TEMP.cs
@@ -1,4 +1,5 @@
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Rhea.Common;
using System.Threading.Tasks;
using Tiger.IBusiness;
@@ -32,6 +33,28 @@
        }
        /// <summary>
        /// 保存标签模板变量
        /// </summary>
        /// <param name="action"></param>
        /// <returns></returns>
        [HttpPost]
        [Route("api/[controller]/[action]")]
        public async Task<IActionResult> SaveLabelTemplateVar([FromBody] ApiAction<BasLabelTempInput> action)
        {
            ApiAction response = new();
            try
            {
                response = response.GetResponse(await DI.Resolve<ILabelTemplate>().SaveLabelTemplateVar(action.Data));
            }
            catch (System.Exception ex)
            {
                response = response.GetResponse().CatchExceptionWithLog(ex);
            }
            return Ok(response);
        }
        /// <summary>
        /// 删除标签模板
        /// </summary>
        /// <param name="action"></param>
Tiger.Business.MES/LabelTemplate/BAS_LABEL_TEMP.cs
@@ -47,6 +47,8 @@
                var dbTran = db.UseTran(() =>
                {
                    db.Deleteable<BAS_LABEL_TEMP>().Where(x => x.ID == Id).ExecuteCommand();
                    db.Deleteable<BAS_LABEL_VAR>().Where(x => x.LABEL_ID == Id).ExecuteCommand();
                    db.Deleteable<BAS_LABEL_VAR_WO>().Where(x => x.LABEL_ID == Id).ExecuteCommand();
                });
                if (!dbTran.IsSuccess)
                {
@@ -74,11 +76,12 @@
            {
                BAS_LABEL_TEMP? prodTemp = null;
                BAS_LABEL_TEMP? prodCustTemp = null;
                var ltemp = await Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(x => x.LABEL_CODE == input.Label.LABEL_CODE).FirstAsync();
                //如果传入的标签客户编码不为空
                if (!input.Label.CUST_CODE.IsNullOrEmpty())
                {
                    //如果查不到标签并且客户编码不为空
                    if (!Biz.Db.Queryable<BAS_LABEL_TEMP>().Any(x => x.LABEL_CODE == input.Label.LABEL_CODE))
                    if (ltemp == null)
                    {
                        prodCustTemp = input.Label;
                        prodTemp = input.Label.Clone();
@@ -88,11 +91,9 @@
                    else
                    {
                        prodCustTemp = input.Label;
                        if (Biz.Db.Queryable<BAS_LABEL_TEMP>().Any(x =>
                        x.LABEL_CODE == input.Label.LABEL_CODE && (
                        (x.PROD_CODE != input.Label.PROD_CODE && x.CUST_CODE == input.Label.CUST_CODE) ||
                        (x.PROD_CODE != input.Label.PROD_CODE && x.CUST_CODE != input.Label.CUST_CODE) ||
                        (x.PROD_CODE == input.Label.PROD_CODE && x.CUST_CODE != input.Label.CUST_CODE))))
                        if ((ltemp.PROD_CODE != input.Label.PROD_CODE && ltemp.CUST_CODE == input.Label.CUST_CODE) ||
                            (ltemp.PROD_CODE != input.Label.PROD_CODE && ltemp.CUST_CODE != input.Label.CUST_CODE) ||
                            (ltemp.PROD_CODE == input.Label.PROD_CODE && ltemp.CUST_CODE != input.Label.CUST_CODE))
                        {
                            prodCustTemp.LABEL_CODE = GenerateCodeName(input.Label.LABEL_CODE, "_L");
                        }
@@ -102,7 +103,7 @@
                {
                    //如果客户编码为空
                    prodTemp = input.Label;
                    if (Biz.Db.Queryable<BAS_LABEL_TEMP>().Any(x => x.LABEL_CODE == input.Label.LABEL_CODE && x.PROD_CODE != input.Label.PROD_CODE))
                    if (ltemp != null && (ltemp.PROD_CODE.IsNullOrEmpty() || ltemp.PROD_CODE != input.Label.PROD_CODE))
                    {
                        prodTemp.LABEL_CODE = GenerateCodeName(input.Label.LABEL_CODE, "_L");
                    }
@@ -154,8 +155,9 @@
                                item.LABEL_ID = temp.ID;
                            }
                        }
                        db.Deleteable<BAS_LABEL_VAR_WO>(false).Where(x => x.LABEL_ID == input.LabelVarWos[0].LABEL_ID).ExecuteCommand();
                        var o = db.Storageable(input.LabelVarWos)
                           .WhereColumns(t => new { t.LABEL_ID, t.VAR_NAME, t.GHOST_ROW })
                           .WhereColumns(t => new { t.LABEL_ID, t.WORK_ORDER, t.VAR_NAME, t.GHOST_ROW })
                           .ToStorage();
                        o.AsInsertable.ExecuteCommand();
                        o.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
@@ -175,6 +177,51 @@
        }
        /// <summary>
        /// 保存标签模板变量
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        public async Task<ApiAction> SaveLabelTemplateVar(BasLabelTempInput input)
        {
            var result = new ApiAction();
            try
            {
                var db = Biz.Db;
                var dbTran = db.UseTran(() =>
                {
                    if (input.LabelVars != null && input.LabelVars.Count > 0)
                    {
                        db.Deleteable<BAS_LABEL_VAR>(false).Where(x => x.LABEL_ID == input.LabelVars[0].LABEL_ID).ExecuteCommand();
                        var z = db.Storageable(input.LabelVars)
                           .WhereColumns(t => new { t.LABEL_ID, t.VAR_NAME, t.GHOST_ROW })
                           .ToStorage();
                        z.AsInsertable.ExecuteCommand();
                        z.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
                    }
                    if (input.LabelVarWos != null && input.LabelVarWos.Count > 0)
                    {
                        db.Deleteable<BAS_LABEL_VAR_WO>(false).Where(x => x.LABEL_ID == input.LabelVarWos[0].LABEL_ID).ExecuteCommand();
                        var o = db.Storageable(input.LabelVarWos)
                           .WhereColumns(t => new { t.LABEL_ID, t.WORK_ORDER, t.VAR_NAME, t.GHOST_ROW })
                           .ToStorage();
                        o.AsInsertable.ExecuteCommand();
                        o.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
                    }
                });
                if (!dbTran.IsSuccess)
                {
                    result.IsSuccessed = false;
                    result.LocaleMsg = new($"保存标签变量异常!");
                }
            }
            catch (Exception ex)
            {
                result.CatchExceptionWithLog(ex, "保存标签变量异常");
            }
            return await Task.FromResult(result);
        }
        /// <summary>
        /// 根据分隔符生成Code名
        /// </summary>
        /// <param name="data"></param>
Tiger.IBusiness/MES/LabelTemplate/ILabelTemplate.cs
@@ -16,5 +16,6 @@
    {
        public Task<ApiAction> SaveLabelTemplate(BasLabelTempInput input);
        public Task<ApiAction> DeleteLabelTemplate(string Id);
        public Task<ApiAction> SaveLabelTemplateVar(BasLabelTempInput input);
    }
}
Tiger.Model.Net/Entitys/BAS/BAS_LABEL_VAR_WO.cs
@@ -64,6 +64,11 @@
        /// </summary>
        [DisplayName("产品编码")]
        public string PROD_CODE { get; set; }
        /// <summary>
        /// 默认值
        /// </summary>
        [DisplayName("默认值")]
        public string DEFAULT_VALUE { get; set; }
        #endregion
        #region 虚拟属性