From 95ba406de3efbc6dc3a3c1386dcd52aed0ef2183 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 26 十一月 2024 16:08:07 +0800
Subject: [PATCH] 优化调试信息
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index 29d2183..83b2e39 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -225,6 +225,8 @@
var _wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == input.WorkOrder).FirstAsync();
if (_wo != null)
{
+ _wo.CHANGE_TIME = _wo.STATUS == BIZ_MES_WO.STATUSs.Paused.GetValue() && input.Status == BIZ_MES_WO.STATUSs.Working.GetValue() ? DateTime.Now : _wo.CHANGE_TIME;
+ _wo.CHANGE_USER = _wo.STATUS == BIZ_MES_WO.STATUSs.Paused.GetValue() && input.Status == BIZ_MES_WO.STATUSs.Working.GetValue() ? input.UserId : _wo.CHANGE_USER;
_wo.STATUS = input.Status < 0 ? _wo.STATUS : input.Status;
_wo.ROUTE_STATUS = input.RouteStatus;
}
@@ -269,6 +271,8 @@
var _woBatch = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.BATCH_NO == input.WoBatch).FirstAsync();
if (_woBatch != null)
{
+ _woBatch.CHANGE_TIME = _woBatch.STATUS == BIZ_MES_WO_BATCH.STATUSs.Paused.GetValue() && input.Status == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue()? DateTime.Now: _woBatch.CHANGE_TIME;
+ _woBatch.CHANGE_USER = _woBatch.STATUS == BIZ_MES_WO_BATCH.STATUSs.Paused.GetValue() && input.Status == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue() ? input.UserId: _woBatch.CHANGE_USER;
_woBatch.STATUS = input.Status < 0 ? _woBatch.STATUS : input.Status;
if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Paused.GetValue())
{
@@ -286,6 +290,8 @@
_woBatch.RELEASE_TIME = DateTime.Now;
_woBatch.RELEASE_USER = input.UserId;
_woBatch.ACT_LINE = input.ActLine;
+ _woBatch.CHANGE_USER = input.UserId;
+ _woBatch.CHANGE_TIME = DateTime.Now;
}
}
else
@@ -301,11 +307,11 @@
//濡傛灉鏄笅鍙�
if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue())
{
- db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS, x.RELEASE_USER, x.RELEASE_TIME, x.ACT_LINE, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
+ db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS, x.RELEASE_USER, x.RELEASE_TIME, x.ACT_LINE, x.UPDATE_USER, x.UPDATE_TIME, x.CHANGE_USER,x.CHANGE_TIME }).ExecuteCommand();
}
else
{
- db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
+ db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS, x.UPDATE_USER, x.UPDATE_TIME, x.CHANGE_USER, x.CHANGE_TIME }).ExecuteCommand();
}
});
if (!dbTran.IsSuccess)
@@ -605,22 +611,31 @@
/// </summary>
/// <param name="wo"></param>
/// <returns></returns>
- public async Task<ApiAction<ShippingOutput>> GetShipList(string wo, string orgCode)
+ public async Task<ApiAction<ShippingOutput>> GetShipList(ShippingInput input)
{
var result = new ApiAction<ShippingOutput>();
try
{
DbClient db = Biz.DataSource["YadaU9C"].Client;
- var org = await Biz.Db.Queryable<SYS_ORGANIZATION>().Where(q => q.ORG_CODE == orgCode).FirstAsync();
- var ship = db.Queryable<mes_ShipList>().Where(q => q.MoDoc.Equals(wo) && q.Org == org.ID.ToInt64()).First();
+ var org = await Biz.Db.Queryable<SYS_ORGANIZATION>().Where(q => q.ORG_CODE == input.orgCode).FirstAsync();
+ string wo = input.wo;
+ if (!input.SN.IsNullOrEmpty() && input.wo.IsNullOrEmpty()) {
+ var woSn = Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN).First();
+ if (!woSn.IsNullOrEmpty()) {
+ wo = woSn.WORK_ORDER;
+ }
+ }
+ var ship = db.Queryable<mes_ShipList>().Where(q => q.MoDoc.Equals(wo) && q.Org == org.ID.ToInt64() && q.Status == 2 ).First();
if (!ship.IsNullOrEmpty())
{
result.Data = ship.BusinessDate.Date == DateTime.Now.Date ? new()
{
+ ShipDoc = ship.ShipDoc,
ShippingQty = ship.ShipQty,
Tag = "Customer"
} : new()
{
+ ShipDoc = ship.ShipDoc,
ShippingQty = ship.ShipQty,
Tag = "InStoreLabel"
};
@@ -630,6 +645,7 @@
{
result.Data = new()
{
+ ShipDoc = "",
ShippingQty = 0,
Tag = "InStoreLabel"
};
@@ -706,20 +722,22 @@
WORK_ORDER = wo.ORDER_NO,
BATCH_NO = woSns[0].BATCH_NO,
ITEM_CODE = wo.ITEM_CODE,
- ITEM_NAME = wo.ItemInfo?.ITEM_NAME,
+ ITEM_NAME = wo.ItemInfo?.ITEM_DESC,
SCAN_QTY = woSns.Count
},
ProdInBatch = new()
{
WORK_ORDER = wo.ORDER_NO,
+ SALES_ORDER = wo.SALES_ORDER,
BATCH_NO = woSns[0].BATCH_NO,
ITEM_CODE = wo.ITEM_CODE,
- ITEM_NAME = wo.ItemInfo?.ITEM_NAME,
+ ITEM_NAME = wo.ItemInfo?.ITEM_DESC,
PLAN_QTY = wo.PLAN_QTY,
SCAN_QTY = woSns.Count
},
InStoreScanInfo = new() {
SN = code,
+ SALES_ORDER = wo.SALES_ORDER,
WORK_ORDER = wo.ORDER_NO,
BATCH_NO = woSns[0].BATCH_NO,
SCAN_QTY = woSns.Count
--
Gitblit v1.9.3