From f2af5cea58ade32013e538c6354bd961ed02cb94 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期四, 17 十月 2024 15:21:11 +0800
Subject: [PATCH] 模板变量更新
---
Tiger.Api/Controllers/Test/TestController.R.cs | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/Tiger.Api/Controllers/Test/TestController.R.cs b/Tiger.Api/Controllers/Test/TestController.R.cs
index 10a486a..0b48c83 100644
--- a/Tiger.Api/Controllers/Test/TestController.R.cs
+++ b/Tiger.Api/Controllers/Test/TestController.R.cs
@@ -21,6 +21,8 @@
using System.Net;
using System.Reflection;
using Swifter.Tools;
+using Tiger.Model.Entitys.MES.Position;
+using Microsoft.CodeAnalysis.Options;
namespace Tiger.Api.Controllers.Test
{
@@ -104,14 +106,19 @@
[HttpGet]
public async Task<IActionResult> Get2Async(string param)
{
- //var auth = new AuthOption() { UserId = "admin", ByOrg = true, ByWh = true };
+ var auth = new AuthOption() { UserId = "admin", ByOrg = true, ByWh = true };
//var data = await Biz.Db.Queryable<BIZ_ERP_PO>().Where(q => q.BILLTYPE == 11)
// //.ByAuth("admin", DbAuth.Org | DbAuth.Wh)
// .ByAuth(auth)
// .ToListAsync();
//data = await Biz.Db.Queryable<BIZ_ERP_PO>().ByAuth("admin", DbAuth.Org).Where(q => q.BILLTYPE == 11).ToListAsync();
- var data = await Biz.Db.Queryable<BIZ_ERP_PO>().Where(q => q.BILLTYPE == 11).ToListAsync();
+ //var data = await Biz.Db.Queryable<BIZ_ERP_PO>().Where(q => q.BILLTYPE == 11).ToListAsync();
//var dtl = await Biz.Db.Queryable<BIZ_ERP_PO_DTL>().ByAuth("admin", DbAuth.Org | DbAuth.Wh).Where(q => q.BILLCODE == "AH3301-221000108").ToListAsync();
+ var query = Biz.Db.Queryable<WMS_ITEM_PKG>().ByAuth("admin", DbAuth.Org | DbAuth.Wh).Where(t => t.SN == "barcode.SN").First();//
+ var data = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER))
+ .ByAuth(auth)//.ByAuth("admin", DbAuth.Org | DbAuth.Wh)
+ .Where((q, s) => s.SN == "input.SN" && q.ACT_LINE == "CurLine.LINE_CODE" && (q.STATUS == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue() || q.STATUS == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue()))
+ .Select((q, s) => new { Batch = q, SN = s }).First();
return Ok(data);
}
@@ -299,8 +306,9 @@
public partial class _TestController : ControllerBase
{
[HttpGet]
- public async Task<IActionResult> DoSomething(int duration)
+ public async Task<IActionResult> DoSomething(int duration, string code)
{
+ Barcode b = new("asdasd");
var begin = DateTime.Now;
while ((DateTime.Now - begin).TotalSeconds <= duration)
{
@@ -310,7 +318,20 @@
ConsoleExt.WriteLine($"Working {begin:mmssfff} ... {(percent > 1 ? 1 : percent):P0} ...", ConsoleColor.Green);
}
Logger.Default.Info($"{begin:mmssfff} completed");
- return Ok($"{begin:mmssfff} completed");
+ return Ok($"{begin:mmssfff} completed {b.DateCode}");
+ }
+
+ [HttpPost]
+ public async Task<IActionResult> MESSubmitAsync([FromBody] ApiAction<SubmitInput> action)
+ {
+ var data = action.Data.Data;
+
+ var act = Biz.Db.Queryable<MES_WO_ACTION>().First(q => q.ID == data);
+
+
+ var result = act.OPTION_1?.ToString().JsonToObject<List<WipPkgItem>>();
+
+ return Ok(result?.ToJson());
}
}
--
Gitblit v1.9.3