修复bug

Rodney Chen

2024-07-14 394189b16b4e0cb6fec8980c3bef15f2aaf10630

修复bug

 Tiger.Business.MES/WorkAction/PrintLabel.cs

@@ -112,6 +112,8 @@
                                case "GetBAS_ITEM":
                                    var itemInfo = Biz.Db.Queryable<BAS_ITEM>().Where(q => q.ITEM_CODE == CurPosition.CurWipSN.ITEM_CODE).First();
                                    return itemInfo.ToJson();
                                case "GetCustomer":
                                    return CurPosition.WorkBatch.Batch.ToJson();
                                default:
                                    return "";
                            }

 Tiger.Business/MES/Biz.WorkAction.cs

文件已删除

 Tiger.Business/MES/Biz.WorkBatch.cs

@@ -32,6 +32,7 @@
            public string OrderNo { get; set; }
            public BIZ_MES_WO WO { get; set; }
            public BIZ_MES_WO_BATCH Batch { get; set; }
            public BAS_CUSTOMER Customer { get; set; }
            public List<BIZ_MES_WO_SN> WoSNs { get; set; }
            public List<MES_WO_EDGE> Edges { get; set; }
            public List<MES_WO_NODE> Nodes { get; set; }
@@ -57,6 +58,7 @@
                WO = Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == OrderNo).First();
                Batch = Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(q => q.ORDER_NO == OrderNo && q.ACT_LINE == lineCode 
                                        && (q.STATUS == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue() || q.STATUS == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue())).First();
                Customer = Biz.Db.Queryable<BAS_CUSTOMER>().Where(q => q.CUST_CODE == WO.CUST_CODE).First();    
                WoSNs = Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q => q.WORK_ORDER == OrderNo).ToList();
                Edges = Biz.Db.Queryable<MES_WO_EDGE>().Where(q => q.WORK_ORDER == OrderNo).ToList();
                Nodes = Biz.Db.Queryable<MES_WO_NODE>().Where(q => q.WORK_ORDER == OrderNo).ToList();

 Tiger.Business/MES/Biz.WorkStep.cs

@@ -10,12 +10,8 @@
using System.Linq;
using Newtonsoft.Json;
using Tiger.IBusiness;
using Microsoft.AspNetCore.Http;
using Tiger.Business.MES;
using Org.BouncyCastle.Ocsp;
using Tiger.Model.Entitys.MES.Position;
using static Tiger.Business.Biz;
using System.ComponentModel;

namespace Tiger.Business
{

 Tiger.IBusiness/MES/IWorkBatch.cs

@@ -14,6 +14,7 @@
        public string OrderNo { get; set; }
        public BIZ_MES_WO WO { get; set; }
        public BIZ_MES_WO_BATCH Batch { get; set; }
        public BAS_CUSTOMER Customer { get; set; }
        public List<BIZ_MES_WO_SN> WoSNs { get; set; }
        public List<MES_WO_EDGE> Edges { get; set; }
        public List<MES_WO_NODE> Nodes { get; set; }