From 666a8c8ed399c6e74b2f307bf6649b32a0fdb3e1 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 23 十月 2024 21:32:31 +0800
Subject: [PATCH] 添加工单工艺路线优化
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 76 ++++++++++++++++++++++++++++++--------
1 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index ec3383a..a9e64a7 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -16,6 +16,7 @@
using Tiger.Model.Entitys.MES.Position;
using Microsoft.AspNetCore.Mvc.RazorPages;
using System.Drawing.Printing;
+using System.Net.NetworkInformation;
namespace Tiger.Business.MES
{
@@ -171,6 +172,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)
{
@@ -308,12 +336,14 @@
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 = @$"{BizConfig.Configuration["UploadAddress"]}//Upload/Template//Temp//{ imageFileName}.png";
+ if (File.Exists(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();
+ foreach (var item in varWoList) {
+ item.LABEL_VIEW_PATH = $"{BizConfig.Configuration["DownloadAddress"]}//Template//Temp//{imageFileName}.png";
+ }
}
var db = Biz.Db;
var dbTran = db.UseTran(() =>
@@ -353,12 +383,12 @@
try
{
QueryAble<BAS_LABEL_VAR_WO> query = new();
- if (input.WorkOrder.IsNullOrEmpty())
- {
- result.IsSuccessed = false;
- result.LocaleMsg = new($"宸ュ崟鍙蜂笉鑳戒负绌猴紒");
- return result;
- }
+ //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)
{
@@ -366,13 +396,24 @@
result.LocaleMsg = new($"妯℃澘涓嶅瓨鍦紒");
return result;
}
- var lableVars = await Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(q => SqlFunc.IsNullOrEmpty(q.WORK_ORDER) && q.LABEL_ID.Equals(labeltemp.ID)).ToListAsync();
- var queryable = Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(q => q.WORK_ORDER.Equals(input.WorkOrder) && q.LABEL_ID.Equals(labeltemp.ID));
- query.page = await queryable.ToPageAsync(input.pageIndex, input.pageSize);
+ 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.page, input.pageSize);
//濡傛灉涓嶅瓨鍦紝鍒欒繑鍥炲垵濮嬫暟鎹�
if (query.page.totals == 0)
{
- query.page = await Biz.Db.Queryable<BAS_LABEL_VAR_WO>().Where(q => SqlFunc.IsNullOrEmpty(q.WORK_ORDER) && q.LABEL_ID.Equals(labeltemp.ID)).ToPageAsync(input.pageIndex, input.pageSize);
+ 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.page, input.pageSize);
query.Items = query.page.data;
}
//濡傛灉鍒濆鍙橀噺鏁板ぇ浜庡伐鍗曡缃殑鍙橀噺鏁�
@@ -382,11 +423,14 @@
{
if (queryable.ToList().Any(q => q.VAR_NAME == item.VAR_NAME))
{
+ var list = queryable.ToList().Where(q => q.VAR_NAME == item.VAR_NAME).First();
+ item.ID = list?.ID;
item.WORK_ORDER = input.WorkOrder;
- item.VAR_VALUE = queryable.ToList().Where(q => q.VAR_NAME == item.VAR_NAME).First()?.VAR_VALUE;
+ item.VAR_VALUE = list?.VAR_VALUE;
+ item.LABEL_VIEW_PATH = list?.LABEL_VIEW_PATH;
}
}
- query.Items = lableVars.Skip((input.pageIndex - 1) * input.pageSize).Take(input.pageSize).ToList();
+ query.Items = lableVars.Skip((input.page - 1) * input.pageSize).Take(input.pageSize).ToList();
query.page.totals = lableVars.Count;
query.page.data = query.Items;
}
--
Gitblit v1.9.3