From 07a89d9d534aab73d4e7a4812a0d78312af72b58 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 14 十月 2024 15:41:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 219 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 201 insertions(+), 18 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index e4039bb..c652c37 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -13,6 +13,9 @@
using Microsoft.AspNetCore.Http;
using Tiger.Model.Entitys.MES.BizMesWoBatch;
using Tiger.Model.Entitys.MES.BizMesWo;
+using Tiger.Model.Entitys.MES.Position;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using System.Drawing.Printing;
namespace Tiger.Business.MES
{
@@ -105,12 +108,18 @@
{
//淇濆瓨鍓嶇殑鍒ゆ柇,骞剁敓鎴愭壒娆″彿
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.IsNullOrEmpty())
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ュ崟涓嶅瓨鍦紝涓嶈兘涓嬪彂锛�");
+ return result;
+ }
+ if (_wo.ROUTE_STATUS != BIZ_MES_WO.ROUTE_STATUSs.Finish.GetValue())
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ュ崟宸ヨ壓璺嚎鏈厤缃紝涓嶈兘涓嬪彂锛�");
+ return result;
+ }
if (_wo.STATUS > (int)BIZ_MES_WO.STATUSs.Working)
{
result.IsSuccessed = false;
@@ -118,19 +127,23 @@
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)
+ if ((batchs.Count > 0 && batchs.Sum(x => x.PLAN_QTY) + input.WoBatch.PLAN_QTY > _wo.PLAN_QTY) || input.WoBatch.PLAN_QTY > _wo.PLAN_QTY)
{
result.IsSuccessed = false;
result.LocaleMsg = new($"宸ュ崟涓嬪彂鐨勬暟閲忚秴杩囧伐鍗曡鍒掓暟閲忥紝涓嶈兘涓嬪彂锛�");
return result;
}
- if (!Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Any(x => x.ORDER_NO == input.Wo.ORDER_NO && x.ACT_LINE == input.WoBatch.ACT_LINE && x.STATUS==(int)BIZ_MES_WO_BATCH.STATUSs.Closed))
+ var _batch = Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.ORDER_NO == input.Wo.ORDER_NO && x.ACT_LINE == input.WoBatch.ACT_LINE && x.STATUS < BIZ_MES_WO.STATUSs.Closed.GetValue()).First();
+ if (_batch != null)
{
result.IsSuccessed = false;
- result.LocaleMsg = new($"宸ュ崟鍦ㄧ嚎浣揫{input.WoBatch.ACT_LINE}]鏈夋病瀹屽伐鐨勫伐鍗曟壒娆★紝涓嶈兘涓嬪彂锛�");
+ result.LocaleMsg = new($"宸ュ崟[{input.Wo.ORDER_NO}]宸茬粡瀛樺湪宸ュ崟鎵规[{_batch.BATCH_NO}]鍦ㄧ嚎浣揫{input.WoBatch.ACT_LINE}]涓姸鎬佷负[{_batch.STATUS.GetEnumDesc<BIZ_MES_WO.STATUSs>()}]锛屼笉鑳戒笅鍙戯紒");
return result;
}
- WoContext.RemoveBatch(input.WoBatch.BATCH_NO);
+ //WoContext.RemoveBatch(input.WoBatch.BATCH_NO);
+ input.Wo.ACT_LINE = input.WoBatch.ACT_LINE;
+ input.Wo.RELEASE_TIME = DateTime.Now;
+ input.Wo.RELEASE_USER = input.WoBatch.UPDATE_USER;
var _batchWos = await Biz.Db.Queryable<V_MES_WO_BATCH>().Where(x => x.ORDER_NO == input.WoBatch.ORDER_NO).ToListAsync();
if (_batchWos.Count > 0)
@@ -157,6 +170,33 @@
{
result.IsSuccessed = false;
result.LocaleMsg = new($"淇濆瓨鎵规宸ュ崟寮傚父");
+ }
+ //濡傛灉鎴愬姛锛屾牴鎹潯浠跺紓姝ヤ繚瀛樺伐鑹鸿矾绾垮埌浜у搧鐨勫鎴�
+ if (result.IsSuccessed && input.IfToCust)
+ {
+ Work.DoAsync(() =>
+ {
+ try
+ {
+ SugarParameter[] pars = Biz.Db.Ado.GetParameters(new { WO = input.Wo.ORDER_NO, ERR_CODE = 0, ERR_MSG = "" });
+ pars[1].Direction = System.Data.ParameterDirection.Output;
+ pars[2].Direction = System.Data.ParameterDirection.Output;
+ Biz.Db.Ado.UseStoredProcedure().ExecuteCommand("SP_MES_WO2CUST", pars);
+ //response.LocaleMsg = new(pars[2].Value.ToString());
+ if (pars[1].Value.ToInt32() == 0)
+ {
+ Logger.Default.Info($"宸ュ崟[{input.Wo.ORDER_NO}]涓嬪彂瀹屾垚鍚庝繚瀛樺伐鑹鸿矾绾挎暟鎹埌浜у搧[{input.Wo.ITEM_CODE}]鐨勫鎴穂{input.Wo.CUST_CODE ?? ""}]鐨勫伐鑹鸿矾绾夸腑锛寋pars[2].Value.ToString()}");
+ }
+ else
+ {
+ Logger.Default.Error($"宸ュ崟[{input.Wo.ORDER_NO}]涓嬪彂瀹屾垚鍚庝繚瀛樺伐鑹鸿矾绾挎暟鎹埌浜у搧[{input.Wo.ITEM_CODE}]鐨勫鎴穂{input.Wo.CUST_CODE ?? ""}]鐨勫伐鑹鸿矾绾垮嚭閿欙紝{pars[2].Value.ToString()}");
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "淇濆瓨鎵规宸ュ崟寮傚父");
+ }
+ });
}
}
catch (Exception ex)
@@ -194,7 +234,7 @@
var db = Biz.Db;
var dbTran = db.UseTran(() =>
{
- db.Updateable(_wo, input.UserId).ExecuteCommand();
+ db.Updateable(_wo, input.UserId).UpdateColumns(x => new { x.STATUS, x.ROUTE_STATUS, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
});
if (!dbTran.IsSuccess)
{
@@ -220,13 +260,28 @@
var result = new ApiAction();
try
{
- //淇濆瓨鍓嶇殑鍒ゆ柇,骞剁敓鎴愭壒娆″彿
- var _wo = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.BATCH_NO == input.WoBatch).FirstAsync();
- if (_wo != null)
+ //淇濆瓨鍓嶇殑鍒ゆ柇
+ var _wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(x => x.ORDER_NO == input.WorkOrder).FirstAsync();
+ var _woBatch = await Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(x => x.BATCH_NO == input.WoBatch).FirstAsync();
+ if (_woBatch != null)
{
- _wo.STATUS = input.Status < 0 ? _wo.STATUS : input.Status;
- if (input.Status == (int) BIZ_MES_WO_BATCH.STATUSs.Paused) {
- WoContext.RemoveBatch(input.WoBatch);
+ _woBatch.STATUS = input.Status < 0 ? _woBatch.STATUS : input.Status;
+ if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Paused.GetValue())
+ {
+ //WoContext.RemoveBatch(input.WoBatch);
+ }
+ //濡傛灉鏄笅鍙�
+ if (input.Status == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue())
+ {
+ if (Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Any(x => x.ORDER_NO == input.WorkOrder && x.BATCH_NO != input.WoBatch && x.ACT_LINE == input.ActLine && BIZ_MES_WO.STATUSs.Imported.GetValue() < x.STATUS && x.STATUS < BIZ_MES_WO.STATUSs.Closed.GetValue()))
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ュ崟瀛樺湪鏈畬鎴愮殑宸ュ崟鎵规锛屼笉鑳戒笅鍙�");
+ return result;
+ }
+ _woBatch.RELEASE_TIME = DateTime.Now;
+ _woBatch.RELEASE_USER = input.UserId;
+ _woBatch.ACT_LINE = input.ActLine;
}
}
else
@@ -239,7 +294,15 @@
var db = Biz.Db;
var dbTran = db.UseTran(() =>
{
- db.Updateable(_wo, input.UserId).ExecuteCommand();
+ //濡傛灉鏄笅鍙�
+ 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();
+ }
+ else
+ {
+ db.Updateable(_woBatch, input.UserId).UpdateColumns(x => new { x.STATUS, x.UPDATE_USER, x.UPDATE_TIME }).ExecuteCommand();
+ }
});
if (!dbTran.IsSuccess)
{
@@ -253,5 +316,125 @@
}
return result;
}
+
+ /// <summary>
+ /// 宸ュ崟妯℃澘鍙橀噺淇敼
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> AddOrEditLabelVarByWorkOrder(BAS_LABEL_VAR_WO input)
+ {
+ var result = new ApiAction();
+ try
+ {
+ //淇濆瓨鍓嶇殑鍒ゆ柇
+ if (input.WORK_ORDER.IsNullOrEmpty())
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ュ崟鍙蜂笉鑳戒负绌猴紒");
+ return result;
+ }
+ List<BAS_LABEL_VAR_WO> varWoList = new();
+ if (File.Exists(input.LABEL_VIEW_PATH))
+ {
+ string imageFileName = Path.GetFileNameWithoutExtension(input.LABEL_VIEW_PATH);
+ string? path = Path.GetDirectoryName(input.LABEL_VIEW_PATH);
+ input.LABEL_VIEW_PATH = $"{path}//Temp//{imageFileName}.png";
+ varWoList = await Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(x => x.LABEL_ID == input.LABEL_ID && x.WORK_ORDER == input.WORK_ORDER).ToListAsync();
+ }
+ var db = Biz.Db;
+ var dbTran = db.UseTran(() =>
+ {
+ var y = db.Storageable(input)
+ .WhereColumns(t => new { t.LABEL_ID, t.WORK_ORDER, t.VAR_NAME, t.GHOST_ROW })
+ .ToStorage();
+ y.AsInsertable.ExecuteCommand();
+ y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
+
+ if (varWoList.Count > 0)
+ {
+ db.Updateable(varWoList).UpdateColumns(q => q.LABEL_VIEW_PATH).ExecuteCommand();
+ }
+ });
+ if (!dbTran.IsSuccess)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"鏇存柊宸ュ崟妯℃澘鍙橀噺寮傚父");
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "鏇存柊宸ュ崟妯℃澘鍙橀噺寮傚父");
+ }
+ return result;
+ }
+
+ /// <summary>
+ /// 鑾峰彇宸ュ崟妯℃澘鍙橀噺
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ public async Task<ApiAction<QueryAble<BAS_LABEL_VAR_WO>>> GetLabelVarByWorkOrder(BizLabelVarWoInput input)
+ {
+ var result = new ApiAction<QueryAble<BAS_LABEL_VAR_WO>>();
+ try
+ {
+ QueryAble<BAS_LABEL_VAR_WO> query = new();
+ //if (input.WorkOrder.IsNullOrEmpty())
+ //{
+ // result.IsSuccessed = false;
+ // result.LocaleMsg = new($"宸ュ崟鍙蜂笉鑳戒负绌猴紒");
+ // return result;
+ //}
+ var labeltemp = Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE.Equals(input.LabelId) || q.ID.Equals(input.LabelId)).First();
+ if (labeltemp == null)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"妯℃澘涓嶅瓨鍦紒");
+ return result;
+ }
+ var lableVars = await Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(q => SqlFunc.IsNullOrEmpty(q.WORK_ORDER)
+ && SqlFunc.IsNullOrEmpty(q.PROD_CODE)
+ && SqlFunc.IsNullOrEmpty(q.CUST_CODE)
+ && q.LABEL_ID.Equals(labeltemp.ID)).ToListAsync();
+ var queryable = Biz.Db.Queryable<BAS_LABEL_VAR_WO>()
+ .Where(q => q.LABEL_ID.Equals(labeltemp.ID))
+ .WhereIF(!input.WorkOrder.IsNullOrEmpty(), q => q.WORK_ORDER.Equals(input.WorkOrder))
+ .WhereIF(!input.ProdCode.IsNullOrEmpty(), q=>q.PROD_CODE.Equals(input.ProdCode))
+ .WhereIF(!input.CustCode.IsNullOrEmpty(), q => q.PROD_CODE.Equals(input.CustCode));
+ query.page = await queryable.ToPageAsync(input.pageIndex, input.pageSize);
+ //濡傛灉涓嶅瓨鍦紝鍒欒繑鍥炲垵濮嬫暟鎹�
+ if (query.page.totals == 0)
+ {
+ query.page = await Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(q => SqlFunc.IsNullOrEmpty(q.WORK_ORDER)
+ && SqlFunc.IsNullOrEmpty(q.PROD_CODE)
+ && SqlFunc.IsNullOrEmpty(q.CUST_CODE)
+ && q.LABEL_ID.Equals(labeltemp.ID))
+ .ToPageAsync(input.pageIndex, input.pageSize);
+ query.Items = query.page.data;
+ }
+ //濡傛灉鍒濆鍙橀噺鏁板ぇ浜庡伐鍗曡缃殑鍙橀噺鏁�
+ if (lableVars.Count > query.page.totals)
+ {
+ foreach (var item in lableVars)
+ {
+ if (queryable.ToList().Any(q => q.VAR_NAME == item.VAR_NAME))
+ {
+ item.WORK_ORDER = input.WorkOrder;
+ item.VAR_VALUE = queryable.ToList().Where(q => q.VAR_NAME == item.VAR_NAME).First()?.VAR_VALUE;
+ }
+ }
+ query.Items = lableVars.Skip((input.pageIndex - 1) * input.pageSize).Take(input.pageSize).ToList();
+ query.page.totals = lableVars.Count;
+ query.page.data = query.Items;
+ }
+ result.Data = query;
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "鑾峰彇宸ュ崟妯℃澘鍙橀噺寮傚父");
+ }
+ return result;
+ }
}
}
--
Gitblit v1.9.3