From 4815ba8990b60ff879b99fec6e77cb73470bdccb Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 19 七月 2024 15:24:25 +0800
Subject: [PATCH] 过站判断当前班次时段并保存
---
Tiger.Business.MES/BIZ_MES_WO.cs | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 70 insertions(+), 5 deletions(-)
diff --git a/Tiger.Business.MES/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ_MES_WO.cs
index d696680..e32dbbd 100644
--- a/Tiger.Business.MES/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ_MES_WO.cs
@@ -10,8 +10,8 @@
using System.Linq;
using Newtonsoft.Json;
using Tiger.IBusiness;
-using static Tiger.Business.Biz;
using Microsoft.AspNetCore.Http;
+using Tiger.Model.Entitys.MES.BizMesWoBatch;
namespace Tiger.Business.MES
{
@@ -27,14 +27,14 @@
var result = new ApiAction();
try
{
- var _wo = Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == wo.ORDER_NO).First();
+ var _wo = Biz.Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == wo.ORDER_NO).First();
if (_wo != null && _wo.STATUS != (int)BIZ_MES_WO.STATUSs.Init)
{
result.IsSuccessed = false;
result.LocaleMsg = new($"宸ュ崟宸茬粡瀛樺湪涓斾笉鏄垵濮嬪寲鐘舵�侊紝涓嶈兘淇濆瓨淇敼锛�");
return result;
}
- var db = Db;
+ var db = Biz.Db;
var dbTran = db.UseTran(() =>
{
var y = db.Storageable(wo)
@@ -67,14 +67,14 @@
try
{
//鏌ヨ鏄惁宸茬粡鏈夊伐鍗曞湪鐢�
- var _wo = Db.Queryable<BIZ_MES_WO>().Where(x => x.ID == woId).First();
+ var _wo = Biz.Db.Queryable<BIZ_MES_WO>().Where(x => x.ID == woId).First();
if (_wo != null && _wo.STATUS != (int)BIZ_MES_WO.STATUSs.Init)
{
result.IsSuccessed = false;
result.LocaleMsg = new($"宸ュ崟涓嶆槸鍒濆鍖栫姸鎬侊紝涓嶈兘鍒犻櫎锛�");
return result;
}
- var db = Db;
+ var db = Biz.Db;
var dbTran = db.UseTran(() =>
{
db.Deleteable<BIZ_MES_WO>().Where(x => x.ID == woId).ExecuteCommand();
@@ -91,5 +91,70 @@
}
return await Task.FromResult(result);
}
+
+ /// <summary>
+ /// 涓嬪彂鏃朵繚瀛樻壒娆″伐鍗曚俊鎭�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> SaveMesBatchWo(SaveWoBatchInput input)
+ {
+ var result = new ApiAction();
+ try
+ {
+ //淇濆瓨鍓嶇殑鍒ゆ柇,骞剁敓鎴愭壒娆″彿
+ var _wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == input.Wo.ORDER_NO).FirstAsync();
+ //if (_wo.STATUS > (int)BIZ_MES_WO.STATUSs.Init)
+ //{
+ // result.IsSuccessed = false;
+ // result.LocaleMsg = new($"宸ュ崟涓嶆槸鍒濆鍖栫姸鎬侊紝涓嶈兘涓嬪彂锛�");
+ // return result;
+ //}
+ if (_wo.STATUS > (int)BIZ_MES_WO.STATUSs.Working)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ュ崟涓嶆槸鍒濆鍖栫姸鎬侊紝涓嶈兘涓嬪彂锛�");
+ return result;
+ }
+ var batchs = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.ORDER_NO == input.Wo.ORDER_NO).ToListAsync();
+ if (batchs.Count > 0 && batchs.Sum(x => x.PLAN_QTY) + input.WoBatch.PLAN_QTY > _wo.PLAN_QTY)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ュ崟涓嬪彂鐨勬暟閲忚秴杩囧伐鍗曡鍒掓暟閲忥紝涓嶈兘涓嬪彂锛�");
+ return result;
+ }
+ var _batchWos = await Biz.Db.Queryable<V_MES_WO_BATCH>().Where(x => x.ORDER_NO == input.WoBatch.ORDER_NO).ToListAsync();
+ if (_batchWos.Count > 0)
+ {
+ input.WoBatch.BATCH_NO = $"{input.WoBatch.ORDER_NO}-{(_batchWos.Max(x => x.BATCH) + 1).ToString("D2")}";
+ }
+ else
+ {
+ input.WoBatch.BATCH_NO = $"{input.WoBatch.ORDER_NO}-01";
+ }
+
+ var db = Biz.Db;
+ var dbTran = db.UseTran(() =>
+ {
+ var y = db.Storageable(input.Wo)
+ .WhereColumns(t => new { t.ORDER_NO, t.GHOST_ROW })
+ .ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+
+ db.Insertable(input.WoBatch).ExecuteCommand();
+ });
+ if (!dbTran.IsSuccess)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"淇濆瓨鎵规宸ュ崟寮傚父");
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "淇濆瓨鎵规宸ュ崟寮傚父");
+ }
+ return result;
+ }
}
}
--
Gitblit v1.9.3