From 28e5551ac4525a12bf762b4836ef37a154ed56f5 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期二, 15 七月 2025 18:03:56 +0800
Subject: [PATCH] 111
---
HH.WCS.Mobox3.NongFuLinZhi/wms/WCSHelper.cs | 122 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 119 insertions(+), 3 deletions(-)
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/wms/WCSHelper.cs b/HH.WCS.Mobox3.NongFuLinZhi/wms/WCSHelper.cs
index 668cb09..6b83aef 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/wms/WCSHelper.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/wms/WCSHelper.cs
@@ -1,4 +1,5 @@
锘縰sing HH.WCS.Mobox3.NFLZ.util;
+using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -13,11 +14,16 @@
var date = DateTime.Now.ToString("yyMMdd");
return $"TN{date}{id.ToString().PadLeft(4, '0')}";
}
- internal static bool UpdateStatus(WCSTask task, string status) {
+ internal static bool UpdateStatus(WCSTask task, string status, string S_AGV_NO = "") {
+ Console.WriteLine("寮�鍙栬揣");
var res = false;
var db = new SqlHelper<WCSTask>().GetInstance();
task.S_B_STATE = status;
- db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE,it.N_B_STATE }).ExecuteCommand();
+ if (S_AGV_NO != "")
+ {
+ task.S_EQ_NO = S_AGV_NO;
+ }
+ db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE,it.N_B_STATE,it.S_EQ_NO }).ExecuteCommand();
return res;
}
internal static bool UpdatePrioryty(WCSTask task,int Prioryty) {
@@ -117,7 +123,7 @@
}
internal static bool CheckActionRecordExist(string no, int code) {
var db = new SqlHelper<TaskAction>().GetInstance();
- return db.Queryable<TaskAction>().Count(a => a.S_TASK_CODE == no&& a.N_ACTION_CODE == code) > 0;
+ return db.Queryable<TaskAction>().Count(a => a.S_TASK_CODE == no && a.N_ACTION_CODE == code) > 0;
}
internal static void Begin(WCSTask task) {
var db = new SqlHelper<WCSTask>().GetInstance();
@@ -206,5 +212,115 @@
{
//var order1 = new SqlHelper<OI_SYS_MAXID>().CreateTable();
}
+
+ #region 鏋楄姖WCS涓氬姟澶勭悊
+ /// <summary>
+ /// 鏋楄姖-鏌ヨ宸ュ崟淇℃伅--鎵ц涓垨鑰呮殏鍋�+ /// </summary>
+ /// <param name="lineNo"></param>
+ /// <returns></returns>
+ public static LinZhiWorkOrder GetLinZhiWorkOrder(string lineNo)
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ var order = db.Queryable<LinZhiWorkOrder>().Where(a => a.S_PLineNo == lineNo && a.S_WorkState == "鎵ц涓�).First();
+ //var order = new SqlHelper<LinJiangWorkOrder>().Get(a => a.S_PLineNo == lineNo && (a.S_WorkState == "鎵ц涓�), a => a.T_CREATE, true);
+ return order;
+ }
+
+ internal List<YiKuWorkOrder> GetLinJianglysisOrderWork(string orderType)
+ {
+ var order = new SqlHelper<YiKuWorkOrder>().GetList(a => a.S_ORDER_TYPE == orderType && a.S_WorkState == "鎵ц涓�);
+ return order;
+ }
+
+ internal static void CreateLinJiangMiddleTableTest()
+ {
+ var order4 = new SqlHelper<OI_SYS_MAXID>().CreateTable();//HTTP鎺ュ彛璋冪敤澶辫触閲嶅彂涓棿琛�+ }
+
+ /// <summary>
+ /// 鏋楄姖-鏌ヨ褰撳墠璁惧淇℃伅
+ /// </summary>
+ /// <param name="lineNo"></param>
+ /// <returns></returns>
+ public static LinZhiDeviceState GetLinJiangDeviceState(string deviceName)
+ {
+ var order = new SqlHelper<LinZhiDeviceState>().Get(a => a.DeviceName == deviceName, a => a.DeviceTime, true);
+ return order;
+ }
+
+ internal static bool UpdateLinJiangDeviceState(LinZhiDeviceState deviceInfo, string status, string dateTime, string extData = "")
+ {
+ var res = false;
+ var db = new SqlHelper<LinZhiDeviceState>().GetInstance();
+ deviceInfo.DeviceState = status;
+ deviceInfo.DeviceTime = dateTime;
+ db.Updateable(deviceInfo).UpdateColumns(it => new { it.DeviceState, it.DeviceTime }).ExecuteCommand();
+ return res;
+ }
+
+ /// <summary>
+ /// 鏋楄姖-鎻掑叆璁惧淇℃伅
+ /// </summary>
+ /// <param name="wmsTask"></param>
+ /// <returns></returns>
+ internal static bool LinJiangInsertDeviceState(LinZhiDeviceState deviceState)
+ {
+ var db = new SqlHelper<LinZhiDeviceState>().GetInstance();
+ return db.Insertable(deviceState).ExecuteCommand() > 0;
+ }
+
+ /// <summary>
+ /// 鏋楄姖-鏌ヨ鎵樼洏淇℃伅-涓嬬嚎鏃堕棿涔嬪墠鐨勬暟鎹�+ /// </summary>
+ /// <param name="lineNo"></param>
+ /// <returns></returns>
+ public static List<LinZhiTrayInfo> GetLinZhiTrayInfoList(string dateTime, string deviceName)
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ var order = new SqlHelper<LinZhiTrayInfo>().GetList(a => Convert.ToDateTime(a.dateTime.Trim()) < Convert.ToDateTime(dateTime) && a.deviceName == deviceName);
+
+ var trayInfo = new SqlHelper<LinZhiTrayInfo>().GetInstance().Queryable<LinZhiTrayInfo>().ToList();
+ LogHelper.Info("瀵屼箰鎵樼洏琛ㄥ叏閮ㄦ暟鎹細" + JsonConvert.SerializeObject(trayInfo));
+
+ //if (order != null && order.Count > 0)
+ //{
+ // //鍒犻櫎褰撳墠浜х嚎涓嬬嚎鏃堕棿鍓�0鍒嗛挓鐨勬墭鐩樻暟鎹�+ // for (int i = order.Count - 1; i >= 0; i--)
+ // {
+
+ // }
+ //}
+ return order;
+ }
+
+ /// <summary>
+ /// 鏋楄姖-鏇存敼宸ュ崟淇℃伅锛氭墭瑙勩�鎵规鍙枫�鐗╂枡灞傛暟
+ /// </summary>
+ /// <param name="task"></param>
+ /// <param name="status"></param>
+ /// <returns></returns>
+ internal static bool UpdateWorkInfo(LinZhiWorkOrder task, string trayRule = "", string batchNo = "", string itemLayer = "")
+ {
+ var res = false;
+ var db = new SqlHelper<LinZhiWorkOrder>().GetInstance();
+ task.S_TrayRules = trayRule;
+ task.S_BatchNo = batchNo;
+ task.S_ItemLayer = itemLayer;
+ db.Updateable(task).UpdateColumns(it => new { it.S_TrayRules, it.S_BatchNo, it.S_ItemLayer }).ExecuteCommand();
+ return res;
+ }
+
+ /// <summary>
+ /// 鏋楄姖-鏌ヨ鎵樼洏淇℃伅-鍏ㄩ儴-涓轰簡瀵规瘮褰撳墠鏄惁涓烘甯镐笅绾�+ /// </summary>
+ /// <param name="lineNo"></param>
+ /// <returns></returns>
+ public static List<LinZhiTrayInfo> GetLinJiangTrayInfoAllList(string deviceName)
+ {
+ var order = new SqlHelper<LinZhiTrayInfo>().GetList(a => a.deviceName == deviceName);
+ return order;
+ }
+ #endregion
}
}
--
Gitblit v1.9.1