From a96e763c96401cbc7695acbcd6b18770d8aedf8d Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 06 十一月 2024 15:35:25 +0800
Subject: [PATCH] 单独解绑更新
---
Tiger.Business.MES/BIZ/BIZ_MES_WO.cs | 224 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 217 insertions(+), 7 deletions(-)
diff --git a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
index a9e64a7..999eeb1 100644
--- a/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
+++ b/Tiger.Business.MES/BIZ/BIZ_MES_WO.cs
@@ -17,6 +17,8 @@
using Microsoft.AspNetCore.Mvc.RazorPages;
using System.Drawing.Printing;
using System.Net.NetworkInformation;
+using Tiger.Model.MES.Yada;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxTokenParser;
namespace Tiger.Business.MES
{
@@ -329,27 +331,34 @@
try
{
//淇濆瓨鍓嶇殑鍒ゆ柇
- if (input.WORK_ORDER.IsNullOrEmpty())
+ if (input.WORK_ORDER.IsNullOrEmpty() && input.PROD_CODE.IsNullOrEmpty())
{
result.IsSuccessed = false;
- result.LocaleMsg = new($"宸ュ崟鍙蜂笉鑳戒负绌猴紒");
+ result.LocaleMsg = new($"宸ュ崟鍙锋垨鑰呬骇鍝佺紪鐮佷笉鑳戒负绌猴紒");
return result;
}
List<BAS_LABEL_VAR_WO> varWoList = new();
string imageFileName = Path.GetFileNameWithoutExtension(input.LABEL_VIEW_PATH);
- string path = @$"{BizConfig.Configuration["UploadAddress"]}//Upload/Template//Temp//{ imageFileName}.png";
+ string path = @$"{BizConfig.Configuration["UploadAddress"]}//Upload/Template//Temp//{imageFileName}.png";
if (File.Exists(path))
{
- 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) {
+ varWoList = await Biz.Db.Queryable<BAS_LABEL_VAR_WO>()
+ .Where(x => x.LABEL_ID == input.LABEL_ID)
+ .WhereIF(!input.WORK_ORDER.IsNullOrEmpty(), x => x.WORK_ORDER == input.WORK_ORDER)
+ .WhereIF(!input.PROD_CODE.IsNullOrEmpty(), x => x.PROD_CODE == input.PROD_CODE)
+ .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(() =>
{
+ Expression<Func<BAS_LABEL_VAR_WO, object>> predicate = !input.WORK_ORDER.IsNullOrEmpty() ? t => new { t.LABEL_ID, t.WORK_ORDER, t.VAR_NAME, t.GHOST_ROW } :
+ !input.PROD_CODE.IsNullOrEmpty() ? t => new { t.LABEL_ID, t.PROD_CODE, t.VAR_NAME, t.GHOST_ROW } : t => new { t.LABEL_ID, t.VAR_NAME, t.GHOST_ROW };
var y = db.Storageable(input)
- .WhereColumns(t => new { t.LABEL_ID, t.WORK_ORDER, t.VAR_NAME, t.GHOST_ROW })
+ .WhereColumns(predicate)
.ToStorage();
y.AsInsertable.ExecuteCommand();
y.AsUpdateable.IgnoreColumns(x => x.ID).ExecuteCommand();
@@ -403,7 +412,7 @@
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.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);
//濡傛灉涓嶅瓨鍦紝鍒欒繑鍥炲垵濮嬫暟鎹�
@@ -426,6 +435,7 @@
var list = queryable.ToList().Where(q => q.VAR_NAME == item.VAR_NAME).First();
item.ID = list?.ID;
item.WORK_ORDER = input.WorkOrder;
+ item.PROD_CODE = input.ProdCode;
item.VAR_VALUE = list?.VAR_VALUE;
item.LABEL_VIEW_PATH = list?.LABEL_VIEW_PATH;
}
@@ -442,5 +452,205 @@
}
return result;
}
+
+ /// <summary>
+ /// 鏇存柊琛屼负涓殑绠卞彿
+ /// </summary>
+ /// <param name="code"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> SavePrintLabelInAct(string code)
+ {
+ var result = new ApiAction();
+ try
+ {
+ var woSn = await Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q=>q.SN == code || q.FLOW_SN == code || q.OUTER_SN == code).FirstAsync();
+ if (woSn == null)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"鏉＄爜涓嶅瓨鍦紒");
+ return result;
+ }
+ //鍙栧緱鍖呰鍒楄〃
+ var pkgList = Biz.Db.Queryable<MES_WIP_PKG>().Where(q => q.PARENT_SN == woSn.OUTER_SN && q.OPER_CODE == "SpecPackingNode").ToList();
+ if (pkgList.Count == 0)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"鏉＄爜涓嶅瓨鍦紒");
+ return result;
+ }
+ List<MES_WIP_ACT> actlist = new List<MES_WIP_ACT>();
+ //瀹㈡埛鏍囩
+ var wipAct = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.CARTON_SN == woSn.OUTER_SN && q.NODE_ID == pkgList[0].NODE_ID && !SqlFunc.IsNullOrEmpty(q.ACT_VALUE_3)).First();
+ if (!wipAct.IsNullOrEmpty())
+ {
+ var label = JsonConvert.DeserializeObject<BAS_LABEL_TEMP>(wipAct.ACT_VALUE_3);
+ var cardNo = label.Variables.Where(q => q.VAR_NAME == "CardQR").FirstOrDefault();
+ if (!woSn.OUTER_SN.IsNullOrEmpty() && !cardNo.IsNullOrEmpty() && !cardNo.Value.StartsWith(woSn.OUTER_SN))
+ {
+ cardNo.Value = $"{woSn.OUTER_SN}{cardNo.Value}";
+ }
+ string ACT_VALUE_3 = JsonConvert.SerializeObject(label);
+ foreach (var pkg in pkgList)
+ {
+ var actSn = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.WIP_ID == pkg.WIP_ID && q.NODE_ID == pkg.NODE_ID && q.ACT_VALUE_4 == "Customer").First();
+ if (!actSn.IsNullOrEmpty())
+ {
+ actSn.ACT_VALUE_3 = ACT_VALUE_3;
+ actlist.Add(actSn);
+ }
+ }
+ }
+ //鍏ュ簱鏍囩
+ var wipActInStore = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.SN == woSn.SN && q.NODE_ID == pkgList[0].NODE_ID && !SqlFunc.IsNullOrEmpty(q.ACT_VALUE_3) && q.ACT_VALUE_4 == "InStroe").First();
+ if (!wipActInStore.IsNullOrEmpty())
+ {
+ var label = JsonConvert.DeserializeObject<BAS_LABEL_TEMP>(wipActInStore.ACT_VALUE_3);
+ var cardNo = label.Variables.Where(q => q.VAR_NAME == "CardQR").FirstOrDefault();
+ if (!woSn.OUTER_SN.IsNullOrEmpty() && !cardNo.IsNullOrEmpty() && !cardNo.Value.StartsWith(woSn.OUTER_SN))
+ {
+ cardNo.Value = $"{woSn.OUTER_SN}{cardNo.Value}";
+ }
+ var xh = label.Variables.Where(q => q.VAR_NAME == "XH").FirstOrDefault();
+ if (!woSn.OUTER_SN.IsNullOrEmpty() && !xh.IsNullOrEmpty())
+ {
+ xh.Value = $"{woSn.OUTER_SN}";
+ }
+ string ACT_VALUE_3 = JsonConvert.SerializeObject(label);
+ foreach (var pkg in pkgList)
+ {
+ var actSn = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => q.WIP_ID == pkg.WIP_ID && q.NODE_ID == pkg.NODE_ID && q.ACT_VALUE_4 == "InStroe").First();
+ if (!actSn.IsNullOrEmpty())
+ {
+ actSn.ACT_VALUE_3 = ACT_VALUE_3;
+ actlist.Add(actSn);
+ }
+ }
+ }
+ var db = Biz.Db;
+ var dbTran = db.UseTran(() =>
+ {
+ db.Updateable(actlist).UpdateColumns(q => new { q.ACT_VALUE_3 }).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> GetRePrintInfo(RePrintInput input)
+ {
+ var result = new ApiAction();
+ try
+ {
+ //鍏堟煡鍑哄伐鍗曟潯鐮佷腑鏄惁瀛樺湪
+ var outerSn = input.Code.Split('|')[0];
+ var woSn = await Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q => q.SN.Equals(input.Code) || q.FLOW_SN.Equals(input.Code) || q.OUTER_SN == outerSn).FirstAsync();
+ if (woSn == null)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"鏉＄爜涓嶅瓨鍦紒");
+ return result;
+ }
+ var woNode = await Biz.Db.Queryable<MES_WO_NODE>().Where(q => q.WORK_ORDER.Equals(woSn.WORK_ORDER) && q.OPER_CODE== "SpecPackingNode").FirstAsync();
+ if (woNode == null)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"宸ヨ壓璺嚎鑺傜偣[SpecPackingNode-瑁呯]涓嶅瓨鍦�");
+ return result;
+ }
+ string printParam = "";
+ var labelPrint = await Biz.Db.Queryable<LOG_LABEL_PRINT>()
+ .WhereIF(input.ReqType == 0, q => q.SN.Equals(woSn.SN) || q.SN.Equals(woSn.FLOW_SN)) //鐧界洅鏍囩
+ .WhereIF(input.ReqType == 1, q => q.SN.Equals(woSn.OUTER_SN) && q.PRINT_LABEL != "InStoreLabel") //绠辨爣绛�-瀹㈡埛
+ .WhereIF(input.ReqType == 2, q => q.SN.Equals(woSn.OUTER_SN) && q.PRINT_LABEL == "InStoreLabel") //绠辨爣绛�-鍏ュ簱
+ .FirstAsync();
+ //濡傛灉鏌ヤ笉鍒板氨鍘昏涓烘棩蹇楁煡
+ if (labelPrint.IsNullOrEmpty() && input.ReqType == 1)
+ {
+ printParam = Biz.Db.Queryable<MES_WIP_ACT>().Where(q => (q.SN.Equals(input.Code) || q.FLOW_SN.Equals(input.Code)) && q.ACT_VALUE_4 == "Customer").First()?.ACT_VALUE_3 ?? "";
+ }
+ else
+ {
+ printParam = labelPrint.PRINT_PARAM;
+ }
+ result.Data = printParam;
+ result.LocaleMsg = new($"閲嶆墦鏉＄爜[{input.Code}]鐨勬爣绛炬垚鍔�");
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "鑾峰彇閲嶆墦鏍囩淇℃伅寮傚父");
+ }
+ return result;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍑鸿揣淇℃伅
+ /// </summary>
+ /// <param name="wo"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> GetShipList(string wo, string orgCode)
+ {
+ var result = new ApiAction();
+ try
+ {
+ DbClient db = Biz.DataSource["YadaU9C"].Client;
+ var org = await Biz.Db.Queryable<SYS_ORGANIZATION>().Where(q=>q.ORG_CODE == orgCode).FirstAsync();
+ var shipList = db.Queryable<mes_ShipList>().Where(q => q.MoDoc.Equals(wo) && SqlFunc.DateIsSame(q.BusinessDate, DateTime.Now) && q.Status == 2 && q.Org == org.ID.ToInt64()).ToList();
+ if (shipList.Any())
+ {
+ result.Data = shipList[0].ShipQty;
+ result.LocaleMsg = new($"鍑鸿揣淇℃伅瀛樺湪锛�");
+ }
+ else
+ {
+ result.Data = "InStoreLabel";
+ }
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "鑾峰彇鍑鸿揣淇℃伅寮傚父");
+ }
+ return result;
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="SN"></param>
+ /// <param name="user"></param>
+ /// <returns></returns>
+ public async Task<ApiAction> UnbindWipSnFromWO(UnbindWipSnInput input)
+ {
+ var result = new ApiAction();
+ try
+ {
+ var cartonSn = input.SN.Split('|')[0];
+ var wipList = await Biz.Db.Queryable<MES_WIP_DATA>().Where(q => q.SN.Equals(input.SN) || q.FLOW_SN.Equals(input.SN) || q.CARTON_SN == cartonSn).ToListAsync();
+ if (wipList.Count == 0)
+ {
+ result.IsSuccessed = false;
+ result.LocaleMsg = new($"瑙ｇ粦鐨勬潯鐮佷笉瀛樺湪褰撳墠鎿嶄綔琛ㄤ腑锛�");
+ }
+ var wo = await Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == wipList[0].WORK_ORDER).FirstAsync();
+ result = WorkBatch.UnbindWipSnFromWO(wo, wipList, input.user);
+ }
+ catch (Exception ex)
+ {
+ result.CatchExceptionWithLog(ex, "瑙ｇ粦鏉＄爜寮傚父");
+ }
+ return result;
+ }
}
}
--
Gitblit v1.9.3