服务端的TigerApi 框架,基于.NET6 2024 版本
Ben Lin
2024-12-01 9fe5cb3330957523a84ab920d9e75eb2572268dc
入库单打印更新
已修改4个文件
已添加3个文件
199 ■■■■ 文件已修改
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.Business.MES/BIZ/BizPrintInstoreDoc.cs 109 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.Business.MES/Transaction/Position.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.Business.MES/iERP/U9C_MES.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.IBusiness.MES/BIZ/IBizPrintInstoreDoc.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.Model.Net/Entitys/MES/ParameterEntity/BizPrintInstoreDocParameter.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.Model.Net/Tiger.Model.Net.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -182,19 +182,18 @@
                    {
                        try
                        {
                            SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { WO = input.Wo.ORDER_NO, ERR_CODE = 0, ERR_MSG = "" });
                            pars[1].Direction = System.Data.ParameterDirection.Output;
                            pars[2].Direction = System.Data.ParameterDirection.Output;
                            Biz.Db.Ado.UseStoredProcedure().ExecuteCommand("SP_MES_WO2CUST", pars);
                            //response.LocaleMsg = new(pars[2].Value.ToString());
                            if (pars[1].Value.ToInt32() == 0)
                            {
                                Logger.Default.Info($"宸ュ崟[{input.Wo.ORDER_NO}]涓嬪彂瀹屾垚鍚庝繚瀛樺伐鑹鸿矾绾挎暟鎹埌浜у搧[{input.Wo.ITEM_CODE}]鐨勫鎴穂{input.Wo.CUST_CODE ?? ""}]鐨勫伐鑹鸿矾绾夸腑锛寋pars[2].Value.ToString()}");
                            }
                            else
                            {
                                Logger.Default.Error($"宸ュ崟[{input.Wo.ORDER_NO}]涓嬪彂瀹屾垚鍚庝繚瀛樺伐鑹鸿矾绾挎暟鎹埌浜у搧[{input.Wo.ITEM_CODE}]鐨勫鎴穂{input.Wo.CUST_CODE ?? ""}]鐨勫伐鑹鸿矾绾垮嚭閿欙紝{pars[2].Value.ToString()}");
                            }
                            //SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { WO = input.Wo.ORDER_NO, ERR_CODE = 0, ERR_MSG = "" });
                            //pars[1].Direction = System.Data.ParameterDirection.Output;
                            //pars[2].Direction = System.Data.ParameterDirection.Output;
                            //Biz.Db.Ado.UseStoredProcedure().ExecuteCommand("SP_MES_WO2CUST", pars);
                            //if (pars[1].Value.ToInt32() == 0)
                            //{
                            //    Logger.Default.Info($"宸ュ崟[{input.Wo.ORDER_NO}]涓嬪彂瀹屾垚鍚庝繚瀛樺伐鑹鸿矾绾挎暟鎹埌浜у搧[{input.Wo.ITEM_CODE}]鐨勫鎴穂{input.Wo.CUST_CODE ?? ""}]鐨勫伐鑹鸿矾绾夸腑锛寋pars[2].Value.ToString()}");
                            //}
                            //else
                            //{
                            //    Logger.Default.Error($"宸ュ崟[{input.Wo.ORDER_NO}]涓嬪彂瀹屾垚鍚庝繚瀛樺伐鑹鸿矾绾挎暟鎹埌浜у搧[{input.Wo.ITEM_CODE}]鐨勫鎴穂{input.Wo.CUST_CODE ?? ""}]鐨勫伐鑹鸿矾绾垮嚭閿欙紝{pars[2].Value.ToString()}");
                            //}
                        }
                        catch (Exception ex)
                        {
Tiger.Business.MES/BIZ/BizPrintInstoreDoc.cs
对比新文件
@@ -0,0 +1,109 @@
锘縰sing Tiger.Model;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Text;
using System.Threading.Tasks;
using Rhea.Common;
using System.Net;
using System.Linq;
using Newtonsoft.Json;
using Tiger.IBusiness;
using Microsoft.AspNetCore.Http;
using Tiger.Model.Entitys.MES.BizMesWoBatch;
using Tiger.Model.Entitys.MES.BizMesWo;
using Tiger.Model.Entitys.MES.BizBasPkgRule;
using Tiger.Model.Entitys.MES.Position;
using Tiger.Model.Entitys.MES.U9C;
using Tiger.Model.Entitys.MES.BizPrintInstoreDoc;
namespace Tiger.Business.MES
{
    public partial class BizPrintInstoreDoc : IBizPrintInstoreDoc
    {
        /// <summary>
        /// 鑾峰彇鍙橀噺
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        public async Task<ApiAction<List<BAS_LABEL_TEMP>>> GetPrintProcessValue(PrintInstoreDocInput input)
        {
            var result = new ApiAction<List<BAS_LABEL_TEMP>>();
            try
            {
                int i = 1;
                int j = 1;
                foreach (var p in input.printJsons)
                {
                    BAS_LABEL_TEMP label = await Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == input.LabelCode).FirstAsync();
                    foreach (var item in label.Variables.OrderBy(q => q.VAR_TYPE == BAS_LABEL_VAR.VAR_TYPEs.BarcodeGenerate.GetValue() ? 0 : 1))
                    {
                        foreach (var v in p.Items) {
                            if (item.VAR_NAME.StartsWith("RcvDoc"))
                            {
                                item.Value = v.ORDER_NO;
                            }
                            if (item.VAR_NAME.StartsWith("SoDoc"))
                            {
                                item.Value = v.SALES_ORDER;
                            }
                            if (item.VAR_NAME.StartsWith("MoDoc"))
                            {
                                item.Value = v.WORK_ORDER;
                            }
                            if (item.VAR_NAME.StartsWith("ItemCode"))
                            {
                                item.Value = v.ITEM_CODE;
                            }
                            if (item.VAR_NAME.StartsWith("Description"))
                            {
                                item.Value = v.ITEM_NAME;
                            }
                            if (item.VAR_NAME.StartsWith("BoxQty"))
                            {
                                item.Value = v.PLAN_QTY.ToString();
                            }
                            if (item.VAR_NAME.StartsWith("InQty"))
                            {
                                item.Value = v.SCAN_QTY.ToString();
                            }
                            if (item.VAR_NAME.StartsWith("RcvQrCode"))
                            {
                                item.Value = v.ORDER_NO.ToString();
                            }
                            if (item.VAR_NAME.StartsWith("SapCode"))
                            {
                                item.Value = v.ITEM_CODE;
                            }
                            if (item.VAR_NAME.StartsWith("Seq"))
                            {
                                item.Value = i.ToString();
                            }
                            i++;
                        }
                        if (item.VAR_NAME == "PageNum")
                        {
                            item.Value = j.ToString();
                        }
                        if (item.VAR_NAME == "PageSize")
                        {
                            item.Value = input.printJsons.Count.ToString();
                        }
                        if (item.VAR_NAME == "BusinessDate")
                        {
                            item.Value = DateTime.Now.ToString("yyyyy.MM.dd");
                        }
                    }
                    j++;
                }
            }
            catch (Exception ex)
            {
                result.CatchExceptionWithLog(ex, "鑾峰彇鍙橀噺寮傚父");
            }
            return result;
        }
    }
}
Tiger.Business.MES/Transaction/Position.cs
@@ -260,16 +260,8 @@
            switch (action.Status)
            {
                case ApiAction.StatusCodes.Success:
                    if (action.Data.IsFinished)
                    {
                        msg.Voice = MQTT.Voice.Pass;
                        msg.Color = "#FF228B22";
                    }
                    else
                    {
                        msg.Voice = MQTT.Voice.Success;
                        msg.Color = "#FF1E90FF";
                    }
                    msg.Voice = MQTT.Voice.Success;
                    msg.Color = "#FF1E90FF";
                    break;
                case ApiAction.StatusCodes.Warning:
                    msg.Voice = MQTT.Voice.Warning;
@@ -292,6 +284,21 @@
                    msg.Color = "#FF000000";
                    break;
            }
            if (action.Data.IsFinished && action.IsSuccessed)
            {
                msg.Voice = MQTT.Voice.Pass;
                msg.Color = "#FF228B22";
            }
            else if (!action.IsSuccessed)
            {
                msg.Voice = MQTT.Voice.Fail;
                msg.Color = "#FFFF0000";
            }
            else
            {
                msg.Voice = MQTT.Voice.Silent;
                msg.Color = "#FF000000";
            }
            action.Data.MqttMsg = msg;
            return action;
        }
Tiger.Business.MES/iERP/U9C_MES.cs
@@ -78,6 +78,7 @@
                            Accuracy = (di["Accuracy"] ?? "").ToString(),
                            Remark = (di["Remark"] ?? "").ToString(),
                            Packaging = (di["Packaging"] ?? "").ToString(),
                            SapCode = (di["Code1"] ?? "").ToString(),
                        };
                        itemExts.Add(extInfo);
                    }
Tiger.IBusiness.MES/BIZ/IBizPrintInstoreDoc.cs
对比新文件
@@ -0,0 +1,20 @@
锘縰sing Rhea.Common;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Tiger.Model;
using Tiger.Model.Entitys.MES.BizBasPkgRule;
using Tiger.Model.Entitys.MES.BizPrintInstoreDoc;
using Tiger.Model.Entitys.MES.Position;
using Tiger.Model.Entitys.MES.U9C;
namespace Tiger.IBusiness
{
    public interface IBizPrintInstoreDoc
    {
        public Task<ApiAction<List<BAS_LABEL_TEMP>>> GetPrintProcessValue(PrintInstoreDocInput input);
    }
}
Tiger.Model.Net/Entitys/MES/ParameterEntity/BizPrintInstoreDocParameter.cs
对比新文件
@@ -0,0 +1,16 @@
锘縰sing System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Tiger.Model.Entitys.MES.U9C;
namespace Tiger.Model.Entitys.MES.BizPrintInstoreDoc
{
    public class PrintInstoreDocInput
    {
        public string LabelCode { get; set; }
        public List<InStorePrintJson> printJsons { get; set; }
    }
}
Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -78,6 +78,7 @@
    <Compile Include="Base\DbEntityBase.cs" />
    <Compile Include="Base\TraceDebug.cs" />
    <Compile Include="DTO\MESDTO.cs" />
    <Compile Include="Entitys\MES\ParameterEntity\BizPrintInstoreDocParameter.cs" />
    <Compile Include="Entitys\BAS\BAS_ITEM_DOC.cs" />
    <Compile Include="Entitys\MQTTEntity.cs" />
    <Compile Include="Entitys\Api\Base.cs" />