From 33b84a02e80c24e2106c67a388d9a3c1fa5f5603 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期二, 17 六月 2025 16:58:15 +0800
Subject: [PATCH] 完善ERP下发任务接口、创建任务与取货完成的信息回报功能
---
api/DebugController.cs | 283 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 169 insertions(+), 114 deletions(-)
diff --git a/api/DebugController.cs b/api/DebugController.cs
index b723b09..28e9bed 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -11,7 +11,10 @@
using Newtonsoft.Json;
+using SqlSugar;
+
using static HH.WCS.Mobox3.DSZSH.api.ApiModel;
+using static HH.WCS.Mobox3.DSZSH.api.OtherModel;
using static HH.WCS.Mobox3.DSZSH.core.Monitor;
namespace HH.WCS.Mobox3.DSZSH.api {
@@ -19,8 +22,7 @@
/// 娴嬭瘯鐢細濡傛灉椤圭洰涓鍜岃澶囧鎺ワ紝鍓嶆湡璁惧鏃犳硶娴嬭瘯锛岀敤鎺ュ彛妯℃嫙
/// </summary>
[RoutePrefix("api")]
- public class DebugController : ApiController
- {
+ public class DebugController : ApiController {
/// <summary>
/// AGV鐘舵�涓�敭鍥炴姤134562
/// </summary>
@@ -29,22 +31,15 @@
[HttpPost]
[Route("AGVSeriesReports")]
public ReturnResults AGVSeriesReports(UpdateTaskState model) {
- //var db = new SqlHelper<object>().GetInstance();
-
- //var task = db.Queryable<TN_Task>().Where(t => t.S_CODE == model.TaskID).First();
- //if (task == null) return new ReturnResults();
- //if (task.S_B_STATE == "瀹屾垚" && task.N_B_STATE == 3 || task.S_B_STATE == "閿欒" && task.N_B_STATE == 4) {
- // return new ReturnResults();
- //}
+ ReturnResults returnResult = new ReturnResults();
+ returnResult.ResultList = new List<ReturnResult>();
var agvTaskState = new AgvTaskState() {
task_no = model.TaskID,
forklift_no = model.ForkliftNo,
- state = 1
};
- ReturnResults returnResult = new ReturnResults();
- returnResult.ResultList = new List<ReturnResult>();
+ agvTaskState.state = 1;
var temp1 = WCSCore.OperateAgvTaskStatus(agvTaskState);
returnResult.ResultList.Add(temp1);
@@ -67,6 +62,67 @@
agvTaskState.state = 2;
var temp2 = WCSCore.OperateAgvTaskStatus(agvTaskState);
returnResult.ResultList.Add(temp2);
+
+ return returnResult;
+ }
+
+ [HttpPost]
+ [Route("AgvReports")]
+ public ReturnResults AgvReports(AgvReportsInfo model) {
+ var db = new SqlHelper<object>().GetInstance();
+ ReturnResults returnResult = new ReturnResults();
+ returnResult.ResultList = new List<ReturnResult>();
+ var agvTaskState = new AgvTaskState() {
+ task_no = model.TaskId,
+ forklift_no = model.ForkliftNo,
+ };
+
+ var taskAction = db.Queryable<TN_Task_Action>()
+ .Where(t => t.S_TASK_CODE == model.TaskId)
+ .OrderBy(t => new { create = SqlFunc.Desc(t.T_CREATE) }).First(); // 鏈�悗涓�釜Action鐘舵�
+
+ var lastState = taskAction?.N_ACTION_CODE ?? 0;
+
+ if (model.NextState <= 0 || model.NextState >= 7) {
+ LogHelper.Info("灏忚溅鍥炴姤鐘舵�涓嶅湪134562鐨勮寖鍥村唴");
+ }
+
+ // 0 ==> 1,3,4,5,6,2
+ if (lastState == 0 && model.NextState >= 1) {
+ agvTaskState.state = 1;
+ var temp = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp);
+ }
+ // 0,1 ==> 3,4,5,6,2
+ if (lastState < 2 && model.NextState >= 2) {
+ agvTaskState.state = 3;
+ var temp = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp);
+ }
+ // 0,1,3 ==> 4,5,6,2
+ if (lastState < 4 && lastState != 2 && (model.NextState >= 3 || model.NextState == 2)) {
+ agvTaskState.state = 4;
+ var temp = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp);
+ }
+ // 0,1,3,4 ==> 5,6,2
+ if (lastState < 5 && lastState != 2 && (model.NextState >= 4 || model.NextState == 2)) {
+ agvTaskState.state = 5;
+ var temp = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp);
+ }
+ // 0,1,3,4,5 ==> 6,2
+ if (lastState < 6 && lastState != 2 && (model.NextState >= 5 || model.NextState == 2)) {
+ agvTaskState.state = 6;
+ var temp = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp);
+ }
+ // 0,1,3,4,5,6 ==> 2
+ if (lastState != 2 && model.NextState == 2) {
+ agvTaskState.state = 2;
+ var temp = WCSCore.OperateAgvTaskStatus(agvTaskState);
+ returnResult.ResultList.Add(temp);
+ }
return returnResult;
}
@@ -137,47 +193,13 @@
/// <returns></returns>
[HttpPost]
[Route("CreateDatabase")]
- public string CreateDatabase(FalseOk model) {
+ public string CreateDatabase() {
try {
- if (model.JumpOut) {
- return "璺冲嚭";
- }
var db = new SqlHelper<object>().GetInstance();
- var entityTypes = new Type[] {
- //typeof(TN_CAR_IN),
- //typeof(TN_CG_Detail),
- //typeof(TN_Container),
- //typeof(TN_Loc_Container),
- //typeof(TN_Location),
- //typeof(TN_Task),
- //typeof(TN_Task_Action),
- //typeof(SysHelper.OI_SYS_MAXID),
+ var entityTypes = new Type[] { };
- //typeof(TN_Inbound_Order),
- //typeof(TN_Check_Detail),
- //typeof(TN_Check_Order),
- //typeof(TN_CNTR_ITEM),
- //typeof(TN_Outbound_Detail),
- //typeof(TN_Outbound_Order),
- //typeof(TN_Shift_Order),
- //typeof(TN_Shift_Detail)
-
- //typeof(TN_Container_Item),
- };
-
- //using (var tran = db.Ado.UseTran()) {
- // //db.CodeFirst.InitTables(entityTypes);
- // if (db.Insertable<TN_Location>(locationList).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // return "澶辫触";
- // }
-
- // tran.CommitTran();
-
-
- //}
-
+ //db.CodeFirst.InitTables(entityTypes);
}
catch (Exception ex) {
LogHelper.Info($"鍙戠敓浜嗗紓甯�);
@@ -200,47 +222,11 @@
const string taskName = TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱;
const string startAreaName = AreaName.B鍖呰鍖�
const string endAreaName = AreaName.M婊℃墭璐ф灦鍖�
+ const string cntrType = "鎵樼洏";
try {
- var itemCode = model.ItemCode;
- var batchNo = model.BatchNo;
var cntrCode = model.CntrCode;
var startLocCode = model.StartLoc;
-
- var cgDetail = new TN_CG_Detail {
- S_ITEM_CODE = itemCode,
- S_BATCH_NO = batchNo,
- S_CNTR_CODE = cntrCode,
- };
-
- var needInsertContainer = false;
- var needUpdateContainer = false;
- // 鏌ュ鍣ㄤ俊鎭〃鏄惁宸茬粡鏈夎繖涓鍣�- var cntr = db.Queryable<TN_Container>()
- .Where(c => c.S_CODE == cntrCode).First();
- // 濡傛灉鎵句笉鍒拌瀹瑰櫒锛岄渶瑕佹坊鍔狅紝骞朵笖灏嗗鍣ㄦ潵婧愯缃负浠诲姟鍚嶇О
- if (cntr == null) {
- needInsertContainer = true;
- LogHelper.Info($"杞锛歿taskName}锛氬鍣細{cntrCode}锛屽湪瀹瑰櫒琛ㄤ腑娌℃湁鐧昏锛岀櫥璁板苟璁剧疆瀹瑰櫒鏉ユ簮涓猴細{taskName}");
-
- cntr = new TN_Container {
- S_CODE = cntrCode,
- S_TYPE = "鎵樼洏",
- S_SPEC = itemCode,
- S_SOURCE = taskName,
- };
- }
- else {
- // 濡傛灉鎵惧埌璇ュ鍣紝浣嗗鍣ㄧ墿鏂欑被鍨嬩笌涓嬬嚎鐗╂枡涓嶇锛岃褰曞苟鐩存帴瑕嗙洊锛堝緟瀹氾級
- if (!string.IsNullOrEmpty(cntr.S_SPEC) && cntr.S_SPEC != itemCode) {
- needUpdateContainer = true;
- LogHelper.Info($"杞锛歿taskName}锛氬鍣ㄨ〃涓鍣▄cntrCode}瀵瑰簲鐨勭墿鏂欎俊鎭細{cntr.S_SPEC}锛� +
- $"涓庢墍闇�鐨勭墿鏂欎俊鎭瘂itemCode}涓嶇锛岀洿鎺ヨ鐩栫粨鏋�);
-
- cntr.S_SPEC = itemCode;
- cntr.S_SOURCE = taskName;
- }
- }
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == startLocCode)
@@ -255,12 +241,17 @@
return info;
}
+ var locCntrRelOld = db.Queryable<TN_Loc_Container>()
+ .Where(c => c.S_CNTR_CODE == cntrCode).First();
+
// 缁戝畾璐т綅鍜屽鍣ㄥ彿
var locCntrRel = new TN_Loc_Container {
S_LOC_CODE = startLocCode,
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- S_CNTR_TYPE = "鎵樼洏",
+ S_CNTR_CODE = cntrCode,
+ S_CNTR_TYPE = cntrType,
};
+
+ startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�
var endLoc = db.Queryable<TN_Location>()
.Where(a => Settings.AreaMap[endAreaName].Contains(a.S_AREA_CODE))
@@ -282,25 +273,11 @@
LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
- if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鎻掑叆瀹瑰櫒璐у搧淇℃伅琛ㄥけ璐ワ細鐗╂枡缂栫爜{cgDetail.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cgDetail.S_CNTR_CODE}";
- LogHelper.Info(info);
- return info;
- }
-
- if (needInsertContainer) {
- if (db.Insertable<TN_Container>(cntr).ExecuteCommand() <= 0) {
- info = $"鎻掑叆瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
+ if (locCntrRelOld != null) {
+ if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0 &&
+ db.Updateable<TN_Location>().SetColumns(l => l.N_CURRENT_NUM == 0).Where(l => l.S_CODE == locCntrRelOld.S_LOC_CODE).ExecuteCommand() <= 0) {
tran.RollbackTran();
- LogHelper.Info(info);
- return info;
- }
- }
- else if (needUpdateContainer) {
- if (db.Updateable<TN_Container>(cntr).ExecuteCommand() <= 0) {
- info = $"鏇存柊瀹瑰櫒琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(cntr);
- tran.RollbackTran();
+ info = $"鍒犻櫎鏃ц揣浣嶅鍣ㄥ叧绯昏〃澶辫触锛氳揣浣嶇紪鐮亄locCntrRelOld.S_LOC_CODE}锛屽鍣ㄧ紪鐮亄locCntrRelOld.S_CNTR_CODE}";
LogHelper.Info(info);
return info;
}
@@ -313,12 +290,7 @@
return info;
}
- if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
- it.N_LOCK_STATE,
- it.S_LOCK_STATE,
- it.S_LOCK_OP,
- it.T_MODIFY
- }).ExecuteCommand() <= 0) {
+ if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new { it.N_LOCK_STATE, it.S_LOCK_STATE, it.S_LOCK_OP, it.T_MODIFY, it.N_CURRENT_NUM }).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
LogHelper.Info(info);
@@ -356,15 +328,83 @@
return ex.Message;
}
}
+
+ [HttpPost]
+ [Route("TestErpSendOutboundPlan")]
+ public ErpResult TestErpSendOutboundPlan(TestErpSendOutboundPlanInfo model) {
+ var apiName = "ERP涓嬪彂鍑哄簱璁″垝鍗�;
+ //LogHelper.InfoApi(apiName, model);
+
+ var erpModel = new ErpSendOutboundPlanInfo();
+ erpModel.jhdh = model.PlanNo;
+ erpModel.cpdm = model.ItemCode;
+ erpModel.pzjs = model.ItemNum;
+
+ LogHelper.InfoApi(apiName, erpModel);
+
+ return ApiHelper.ErpSendOutboundPlan(erpModel);
+ }
+
+ [HttpPost]
+ [Route("PickUpReturn")]
+ public TestErpResult PickUpReturn(PickUpReturnErpInfo model) {
+ if (model.sfjs == 0) {
+ return new TestErpResult {
+ code = 1,
+ message = "瀹炲彂浠舵暟鏈‘瀹�
+ };
+ }
+
+ return new TestErpResult {
+ code = 0,
+ message = "success"
+ };
+ }
+
+ [HttpPost]
+ [Route("CreateTaskReturn")]
+ public TestErpResult CreateTaskReturn(CreateTaskReturnErpInfo model) {
+ if (model.hw == "") {
+ return new TestErpResult {
+ code = 1,
+ message = "璐т綅淇℃伅鏈彁渚�
+ };
+ }
+
+ return new TestErpResult {
+ code = 0,
+ message = "success"
+ };
+ }
+ }
+
+ public class TestErpSendOutboundPlanInfo {
+ /// <summary>
+ /// 鍑哄簱璁″垝鍗曞彿锛堣鍒掑崟鍙�jhdh锛�+ /// </summary>
+ public string PlanNo { get; set; } = string.Empty;
+ /// <summary>
+ /// 鐗╂枡缂栫爜锛堜骇鍝佷唬鐮�cpdm锛�+ /// </summary>
+ public string ItemCode { get; set; } = string.Empty;
+ /// <summary>
+ /// 鐗╂枡鏁伴噺锛堟淳瑁呬欢鏁�pzjs锛�+ /// </summary>
+ public float ItemNum { get; set; } = 0;
+ }
+
+ public class TestErpResult {
+ public int code { get; set; }
+ public string message { get; set; }
}
public class AddInboundTaskInfo {
/// <summary>
- /// 鐗╂枡缂栫爜
+ /// 鐗╂枡缂栫爜锛堟殏鏃舵病鐢級
/// </summary>
public string ItemCode { get; set; }
/// <summary>
- /// 鎵规鍙�+ /// 鎵规鍙凤紙鏆傛椂娌＄敤锛� /// </summary>
public string BatchNo { get; set; }
/// <summary>
@@ -395,6 +435,21 @@
//public int NextState { set; get; }
}
+ public class AgvReportsInfo {
+ /// <summary>
+ /// 浠诲姟鍙�+ /// </summary>
+ public string TaskId { set; get; }
+ /// <summary>
+ /// AGV 灏忚溅鍙�+ /// </summary>
+ public string ForkliftNo { get; set; }
+ /// <summary>
+ /// AGV 涓嬩竴鐘舵�锛堜换鍔″洖鎶ュ彿锛�+ /// </summary>
+ public int NextState { set; get; } = 0;
+ }
+
public class FalseOk {
public bool JumpOut { set; get; } = true;
}
--
Gitblit v1.9.1