From 99004292e20a9e1efa4e3b11b8c319bfd796912c Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期一, 14 七月 2025 17:24:30 +0800
Subject: [PATCH] 111
---
HH.WCS.Mobox3.NongFuLinZhi/api/ApiHelper.cs | 128 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 117 insertions(+), 11 deletions(-)
diff --git a/HH.WCS.Mobox3.NongFuLinZhi/api/ApiHelper.cs b/HH.WCS.Mobox3.NongFuLinZhi/api/ApiHelper.cs
index fb94dfa..d8371e8 100644
--- a/HH.WCS.Mobox3.NongFuLinZhi/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3.NongFuLinZhi/api/ApiHelper.cs
@@ -294,17 +294,11 @@
db.Updateable(task).UpdateColumns(it => new { it.S_NOTE }).ExecuteCommand();
}
-
-
-
-
-
-
internal static WeiLiResult CancelOrder(CancelOrderModel model)
{
WeiLiResult result = new WeiLiResult();
var db = new SqlHelper<object>().GetInstance();
- var tasks = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == model.orderNo).ToList();
+ var tasks = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == model.task_no).ToList();
if (tasks.Count >= 1)
{
//娴佺▼浠诲姟鏁伴噺鎵ц瓒呰繃涓�潯 浠诲姟涓嶅厑璁稿彇娑�@@ -312,7 +306,7 @@
result.msg = "娴佺▼浠诲姟鎵ц涓�涓嶅厑璁稿彇娑�;
return result;
}
- var task = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == model.orderNo).OrderByDescending(a => a.T_CREATE).First();
+ var task = db.Queryable<WCSTask>().Where(a => a.S_OP_CODE == model.task_no).OrderByDescending(a => a.T_CREATE).First();
if (task != null)
{
if (WCSHelper.CheckActionRecordExist(task.S_CODE, 4))
@@ -324,7 +318,7 @@
if (task.N_B_STATE == 0)
{
//绛夊緟鐩存帴淇敼鐘舵�涓哄彇娑�- WCSHelper.UpdateStatus(model.orderNo, 5);
+ WCSHelper.UpdateStatus(model.task_no, 5);
//result.msg = "浠诲姟绛夊緟锛岀洿鎺ュ彇娑�;
}
else if (task.N_B_STATE != 3 && task.N_B_STATE != 4)
@@ -336,7 +330,8 @@
else
{
//宸叉帹閫佷絾鏄病鏈夊畬鎴愭垨鑰呭彇娑堬紝閫氱煡hosttoagv
- NDCHelper.Cancel(task.S_CODE.Trim());
+ //NDCHelper.Cancel(task.S_CODE.Trim());
+ NDCApi.CancelOrder(task.S_CODE.Trim());
//result.msg = "浠诲姟鍙栨秷宸茬粡鍙戦�缁欏皬杞�;
}
}
@@ -379,7 +374,8 @@
else
{
//閫氱煡鏉弶淇敼浼樺厛绾�- NDCHelper.Cancel(task.S_CODE.Trim());
+ //NDCHelper.Cancel(task.S_CODE.Trim());
+ NDCApi.CancelOrder(task.S_CODE.Trim());
result.msg = "淇敼浼樺厛绾ф垚鍔�;
}
}
@@ -677,6 +673,116 @@
return result;
}
+ internal static ReturnResult bindCntr(bindModel model)
+ {
+ ReturnResult result = new ReturnResult() {ResultCode = -1 };
+ var db = new SqlHelper<object>().GetInstance();
+
+ if (TaskProcess.BindLocCntr(model.S_LOC_CODE, model.S_CNTR_CODE, model.S_ITEM_CODE, model.S_BATCH_CODE))
+ {
+ int num = model.S_CNTR_CODE.Split(',').Count();
+ var locInfo = db.Queryable<Location>().Where(a => a.S_CODE == model.S_LOC_CODE).First();
+ if(locInfo != null)
+ {
+ locInfo.N_CURRENT_NUM = locInfo.N_CURRENT_NUM + num > locInfo.N_CAPACITY ? locInfo.N_CAPACITY : locInfo.N_CURRENT_NUM + num;
+ db.Updateable(locInfo).UpdateColumns(a => new { a.N_CURRENT_NUM }).ExecuteCommand();
+ result.ResultCode = 0;
+ }
+ }
+ return result;
+ }
+
+ internal static ReturnResult unBindCntr(unBindModel model)
+ {
+ ReturnResult result = new ReturnResult() { ResultCode = -1 };
+ var db = new SqlHelper<object>().GetInstance();
+ var locInfo = db.Queryable<Location>().Where(a => a.S_CODE == model.S_LOC_CODE).First();
+ if(locInfo != null)
+ {
+ var cntrList = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == model.S_LOC_CODE).ToList();
+ if(cntrList.Count > 0)
+ {
+ for (int i = cntrList.Count - 1; i >= 0; i --)
+ {
+ string cntrCode = cntrList[i].S_CNTR_CODE;
+ db.Deleteable<CntrItemRel>().Where(a => a.S_CNTR_CODE == cntrCode).ExecuteCommand();
+ db.Deleteable<LocCntrRel>().Where(a => a.S_CNTR_CODE == cntrCode).ExecuteCommand();
+ db.Deleteable<Container>().Where(a => a.S_CODE == cntrCode).ExecuteCommand();
+ }
+ }
+ locInfo.N_CURRENT_NUM = locInfo.N_CURRENT_NUM - 1;
+ if (locInfo.N_CURRENT_NUM < 0) locInfo.N_CURRENT_NUM = 0;
+ db.Updateable(locInfo).UpdateColumns(a => new { a.N_CURRENT_NUM }).ExecuteCommand();
+ result.ResultCode = 0;
+ }
+ return result;
+ }
+
+ internal static ReturnResult JBIn(JBInModel model)
+ {
+ ReturnResult result = new ReturnResult() { ResultCode = -1 };
+ string cntrCode = Guid.NewGuid().ToString("N");
+ string batch = "";
+ if (model.S_ITEM_TYPE == "灏忓寘瑁呯洊")
+ {
+ //灏忓寘瑁呯洊榛樿涓�眰
+ batch = "灏忓寘瑁呯洊";
+ }
+ if (model.S_ITEM_TYPE == "鐡跺澂")
+ {
+ //鐡跺澂榛樿涓ゅ眰
+ cntrCode = cntrCode + ","+ Guid.NewGuid().ToString("N");
+ }
+ if (model.S_ITEM_TYPE == "澶у寘瑁呯洊")
+ {
+ //澶у寘瑁呯洊榛樿涓夊眰
+ cntrCode = cntrCode + "," + Guid.NewGuid().ToString("N") + "," + Guid.NewGuid().ToString("N");
+ batch = "澶у寘瑁呯洊";
+ }
+ //鍒涘缓浣滀笟
+ LogHelper.Info($"JBIn:{model.S_LOC_CODE},{cntrCode},{"鎸囧畾搴撳尯-" + model.S_END_AREA}");
+ if(WMSHelper.CreateOpTask(model.S_LOC_CODE, "", "鍏ュ簱", "鎺ラ┏浣嶅叆搴�, cntrCode, "鎸囧畾搴撳尯-" + model.S_END_AREA))
+ {
+ TaskProcess.BindLocCntr(model.S_LOC_CODE, cntrCode, model.S_ITEM_CODE, batch);
+ result.ResultCode = 0;
+ }
+
+ return result;
+ }
+
+ internal static ReturnResult PtpTask(PtpTaskModel model, ReturnResult result)
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ var startLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.S_START_LOC).First();
+ if(startLoc != null && startLoc.S_LOCK_STATE == "鏃�)
+ {
+ string cntrCode = "";
+ var cntrInfo = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).First();
+ if(cntrInfo != null)
+ {
+ cntrCode = cntrInfo.S_CNTR_CODE;
+ }
+ else
+ {
+ cntrCode = Guid.NewGuid().ToString("N");
+ }
+ var endLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.S_END_LOC).First();
+ if (endLoc != null && endLoc.S_LOCK_STATE == "鏃�)
+ {
+ WMSHelper.CreateOpTask(model.S_START_LOC, model.S_END_LOC, "鍏ュ簱", "鐐瑰埌鐐硅浆杩�, cntrCode, "");
+ }
+ else
+ {
+ result.ResultMsg = $"缁堢偣璐т綅涓嶅瓨鍦ㄦ垨鑰呮湁閿侊紝璐т綅缂栫爜锛歿model.S_END_LOC}";
+ }
+ }
+ else
+ {
+ result.ResultMsg = $"璧风偣璐т綅涓嶅瓨鍦ㄦ垨鑰呮湁閿侊紝璐т綅缂栫爜锛歿model.S_START_LOC}";
+ }
+ return result;
+ }
+
//public class AddTaskModel
//{
--
Gitblit v1.9.1