From 394189b16b4e0cb6fec8980c3bef15f2aaf10630 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 14 七月 2024 17:22:12 +0800
Subject: [PATCH] 修复bug
---
/dev/null | 45 ---------------------------------------------
Tiger.Business/MES/Biz.WorkBatch.cs | 2 ++
Tiger.Business.MES/WorkAction/PrintLabel.cs | 2 ++
Tiger.IBusiness/MES/IWorkBatch.cs | 1 +
Tiger.Business/MES/Biz.WorkStep.cs | 4 ----
5 files changed, 5 insertions(+), 49 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PrintLabel.cs b/Tiger.Business.MES/WorkAction/PrintLabel.cs
index 52b001d..115ab6d 100644
--- a/Tiger.Business.MES/WorkAction/PrintLabel.cs
+++ b/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 "";
}
diff --git a/Tiger.Business/MES/Biz.WorkAction.cs b/Tiger.Business/MES/Biz.WorkAction.cs
deleted file mode 100644
index 66ebe06..0000000
--- a/Tiger.Business/MES/Biz.WorkAction.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-锘縰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.Business.MES;
-using Org.BouncyCastle.Ocsp;
-using Tiger.Model.Entitys.MES.Position;
-using static Tiger.Business.Biz;
-
-namespace Tiger.Business
-{
- public partial class Biz
- {
- /// <summary>
- /// 宸ュ崟琛屼负
- /// </summary>
- public partial class WorkAction : IWorkAction
- {
- public WorkAction(MES_WO_NODE_ACT action, MES_WO_ACTION setting)
- {
- Action = action;
- Setting = setting;
- }
-
- #region Propertys & Variables
- public MES_WO_NODE_ACT Action { get; set; }
- public MES_WO_ACTION Setting { get; set; }
- #endregion
-
- #region Functions
-
- #endregion
-
- }
- }
-}
diff --git a/Tiger.Business/MES/Biz.WorkBatch.cs b/Tiger.Business/MES/Biz.WorkBatch.cs
index 03806a0..28e9b99 100644
--- a/Tiger.Business/MES/Biz.WorkBatch.cs
+++ b/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();
diff --git a/Tiger.Business/MES/Biz.WorkStep.cs b/Tiger.Business/MES/Biz.WorkStep.cs
index 332be9e..9b50319 100644
--- a/Tiger.Business/MES/Biz.WorkStep.cs
+++ b/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
{
diff --git a/Tiger.IBusiness/MES/IWorkBatch.cs b/Tiger.IBusiness/MES/IWorkBatch.cs
index 5afadae..ed2abfe 100644
--- a/Tiger.IBusiness/MES/IWorkBatch.cs
+++ b/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; }
--
Gitblit v1.9.3