From fab78d94b10f66cf161b282e5f31d06e26abb4e4 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 21 一月 2025 09:35:40 +0800
Subject: [PATCH] 为 _wo 对象添加 RELEASE_TIME 和 RELEASE_USER 属性
---
Tiger.Business/MES/Biz.Route.cs | 83 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 76 insertions(+), 7 deletions(-)
diff --git a/Tiger.Business/MES/Biz.Route.cs b/Tiger.Business/MES/Biz.Route.cs
index 2e6c16b..24cc730 100644
--- a/Tiger.Business/MES/Biz.Route.cs
+++ b/Tiger.Business/MES/Biz.Route.cs
@@ -14,6 +14,7 @@
using Tiger.Model.Entitys.WMS.DTOS;
using static Tiger.Model.BIZ_MES_WO;
using Tiger.Model.Entitys.MES.Position;
+using System.Security.Cryptography;
namespace Tiger.Business
{
@@ -441,6 +442,12 @@
try
{
//鏌ヨ鏄惁宸茬粡鏈夊伐鍗曞湪鐢ㄦ垨鑰呮湁缁戝畾浜у搧
+ if (Biz.Db.Queryable<MES_PROD_OPER>().Any(q=>q.ROT_ID == routeId))
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ヨ壓璺嚎宸茬粡缁戝畾浜嗕骇鍝侊紝涓嶈兘鍒犻櫎宸ヨ壓璺嚎");
+ return result;
+ }
var db = Db;
var dbTran = db.UseTran(() =>
@@ -507,12 +514,12 @@
{
var expable = Expressionable.Create<MES_PROD_ACTION>();
var expableOper = Expressionable.Create<MES_PROD_OPER>();
- if (!string.IsNullOrEmpty(input.rotId))
+ if (!input.rotId.IsNullOrEmpty())
{
expable.And(x => x.ROT_ID == input.rotId);
expableOper.And(x => x.ROT_ID == input.rotId);
}
- else if (!string.IsNullOrEmpty(input.rotCode))
+ else if (!input.rotCode.IsNullOrEmpty())
{
var item = await Db.Queryable<MES_ROUTE>().Where(x => x.ROT_CODE == input.rotCode).FirstAsync();
if (item != null)
@@ -521,17 +528,32 @@
expableOper.And(x => x.ROT_ID == item.ID);
}
}
-
- expable.And(x => x.PROD_CODE == input.prodCode && x.CUST_CODE == input.custCode);
- expableOper.And(x => x.PROD_CODE == input.prodCode && x.CUST_CODE == input.custCode);
+ if (!input.prodCode.IsNullOrEmpty())
+ {
+ expable.And(x => x.PROD_CODE == input.prodCode );
+ expableOper.And(x => x.PROD_CODE == input.prodCode);
+ }
+ if (!input.custCode.IsNullOrEmpty())
+ {
+ expable.And(x => x.CUST_CODE == input.custCode);
+ expableOper.And(x => x.CUST_CODE == input.custCode);
+ }
var exp = expable.ToExpression();
var expOper = expableOper.ToExpression();
var db = Db;
var dbTran = db.UseTran(() =>
{
- db.Deleteable<MES_PROD_ACTION>().Where(exp).ExecuteCommand();
- db.Deleteable<MES_PROD_OPER>().Where(expOper).ExecuteCommand();
+ if (!input.prodCode.IsNullOrEmpty())
+ {
+ db.Deleteable<MES_PROD_ACTION>().Where(exp).ExecuteCommand();
+ db.Deleteable<MES_PROD_OPER>().Where(expOper).ExecuteCommand();
+ }
+ if (input.prodCode.IsNullOrEmpty() && !input.custCode.IsNullOrEmpty())
+ {
+ db.Updateable<MES_PROD_ACTION>().SetColumns(x => x.CUST_CODE == "").Where(exp).ExecuteCommand();
+ db.Updateable<MES_PROD_OPER>().SetColumns(x => x.CUST_CODE == "").Where(expOper).ExecuteCommand();
+ }
});
if (!dbTran.IsSuccess)
{
@@ -990,6 +1012,53 @@
}
return result;
}
+
+ /// <summary>
+ /// 娣诲姞宸ュ崟宸ヨ壓璺嚎
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> ProdRouteToWo(WoRotInput input)
+ {
+ var result = new ApiAction();
+ try
+ {
+ //淇濆瓨鍓嶅垽鏂�
+ if (Db.Queryable<BIZ_MES_WO>().Any(x => x.ORDER_NO == input.wo && x.STATUS > STATUSs.Init.GetValue() && x.STATUS < STATUSs.Closed.GetValue())) {
+
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ュ崟[{input.wo}]鐘舵�佷笉鏄垵濮嬪寲鎴栬�呭畬鎴愶紝涓嶅彲浠ヤ慨鏀瑰伐鑹鸿矾绾匡紒");
+ return result;
+ }
+
+ var wo = await Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == input.wo).FirstAsync();
+ wo.ROUTE_STATUS = ROUTE_STATUSs.Finish.GetValue();
+
+ SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { ROT_ID = input.rotId, WO = input.wo, ERR_CODE = 0, ERR_MSG = "" });
+ pars[2].Direction = System.Data.ParameterDirection.Output;
+ pars[3].Direction = System.Data.ParameterDirection.Output;
+ Biz.Db.Ado.UseStoredProcedure().ExecuteCommand("SP_MES_PROD2WO", pars);
+ result.Data = pars[2].Value;
+ result.IsSuccessed = pars[2].Value.ToInt32() == 0 ? true : false;
+ result.LocaleMsg = new(pars[3].Value.ToString());
+
+ var db = Db;
+ var dbTran = db.UseTran(() =>
+ {
+ db.Updateable(wo, input.userId).UpdateColumns(x => new { x.ROUTE_STATUS, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"娣诲姞宸ュ崟宸ヨ壓璺嚎寮傚父");
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "娣诲姞宸ュ崟宸ヨ壓璺嚎寮傚父");
+ }
+ return result;
+ }
} //endClass Route
} //endClass Biz
}
--
Gitblit v1.9.3