From f8d23dcf8d6501482db1a5180325194232afe96c Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 18 七月 2025 17:30:09 +0800
Subject: [PATCH] 封装部分业务代码，继续优化日志打印流程
---
api/DebugController.cs | 624 ++++++++++++++------------------------------------------
1 files changed, 154 insertions(+), 470 deletions(-)
diff --git a/api/DebugController.cs b/api/DebugController.cs
index 105b0e6..57215cd 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using System.IO;
using System.Runtime.ConstrainedExecution;
using System.Web.Http;
@@ -11,16 +12,19 @@
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.Config;
using static HH.WCS.Mobox3.DSZSH.core.Monitor;
namespace HH.WCS.Mobox3.DSZSH.api {
/// <summary>
- /// 娴嬭瘯鐢細濡傛灉椤圭洰涓鍜岃澶囧鎺ワ紝鍓嶆湡璁惧鏃犳硶娴嬭瘯锛岀敤鎺ュ彛妯℃嫙
+ /// 娴嬭瘯鐢�濡傛灉椤圭洰涓鍜岃澶囧鎺�鍓嶆湡璁惧鏃犳硶娴嬭瘯,鐢ㄦ帴鍙ｆā鎷� /// </summary>
[RoutePrefix("api")]
- public class DebugController : ApiController
- {
+ public class DebugController : ApiController {
/// <summary>
/// AGV鐘舵�涓�敭鍥炴姤134562
/// </summary>
@@ -29,22 +33,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);
@@ -72,170 +69,18 @@
}
/// <summary>
- /// AGV鐘舵�涓�敭鍥炴姤134
- /// </summary>
- /// <param name="model">瀹瑰櫒鍙�/param>
- /// <returns></returns>
- [HttpPost]
- [Route("AGVSeriesReports14")]
- public ReturnResults AGVSeriesReports14(UpdateTaskState model) {
- var agvTaskState = new AgvTaskState() {
- task_no = model.TaskID,
- forklift_no = model.ForkliftNo,
- state = 1
- };
- ReturnResults returnResult = new ReturnResults();
- returnResult.ResultList = new List<ReturnResult>();
-
- var temp1 = WCSCore.OperateAgvTaskStatus(agvTaskState);
- returnResult.ResultList.Add(temp1);
-
- agvTaskState.state = 3;
- var temp3 = WCSCore.OperateAgvTaskStatus(agvTaskState);
- returnResult.ResultList.Add(temp3);
-
- agvTaskState.state = 4;
- var temp4 = WCSCore.OperateAgvTaskStatus(agvTaskState);
- returnResult.ResultList.Add(temp4);
-
- return returnResult;
- }
-
- /// <summary>
- /// AGV鐘舵�涓�敭鍥炴姤562
- /// </summary>
- /// <param name="model">瀹瑰櫒鍙�/param>
- /// <returns></returns>
- [HttpPost]
- [Route("AGVSeriesReports62")]
- public ReturnResults AGVSeriesReports62(UpdateTaskState model) {
- var agvTaskState = new AgvTaskState() {
- task_no = model.TaskID,
- forklift_no = model.ForkliftNo,
- state = 5
- };
- ReturnResults returnResult = new ReturnResults();
- returnResult.ResultList = new List<ReturnResult>();
-
- var temp5 = WCSCore.OperateAgvTaskStatus(agvTaskState);
- returnResult.ResultList.Add(temp5);
-
- agvTaskState.state = 6;
- var temp6 = WCSCore.OperateAgvTaskStatus(agvTaskState);
- returnResult.ResultList.Add(temp6);
-
- agvTaskState.state = 2;
- var temp2 = WCSCore.OperateAgvTaskStatus(agvTaskState);
- returnResult.ResultList.Add(temp2);
-
- return returnResult;
- }
-
- /// <summary>
/// 鍒濆鍖栨暟鎹簱
/// </summary>
/// <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),
- };
-
- //var areaNameList = new List<string>();
- //foreach (var area in Settings.Areas) {
- // areaNameList.AddRange(area.Codes);
- //}
-
- //var locationList = new List<TN_Location>();
- //foreach (var area in areaNameList) {
- // int i = 0;
- // int j = 0;
- // int k = 0;
-
- // if (area == "KXHJQ" || area == "MTHJQ" || area == "MXHJQ") {
- // for (i = 1; i <= 4; i++) {
- // for (j = 1; j <= 5; j++) {
- // for (k = 1; k <= 3; k++) {
- // locationList.Add(new TN_Location() {
- // N_ROW = i,
- // N_COL = j,
- // N_LAYER = k,
- // S_AREA_CODE = area,
- // S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}" +
- // $"-{k.ToString().PadLeft(2, '0')}"
- // });
- // }
- // }
- // }
- // continue;
- // }
-
- // if (area == "BZQ") {
- // for (i = 1; i <= 2; i++) {
- // for (j = 1; j <= 2; j++) {
- // locationList.Add(new TN_Location() {
- // N_ROW = i,
- // N_COL = j,
- // S_AREA_CODE = area,
- // S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}"
- // });
- // }
- // }
- // continue;
- // }
-
- // i = 1;
- // for (j = 1; j <= 5; j++) {
- // locationList.Add(new TN_Location() {
- // N_ROW = i,
- // N_COL = j,
- // S_AREA_CODE = area,
- // S_CODE = $"{area}-{i.ToString().PadLeft(2, '0')}-{j.ToString().PadLeft(2, '0')}"
- // });
- // }
-
-
- //}
-
-
-
- //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($"鍙戠敓浜嗗紓甯�);
@@ -245,319 +90,166 @@
}
/// <summary>
- /// DEBUG锛氭彃鍏ヨ揣浣嶃�瀹瑰櫒銆佽揣鍝佷俊鎭�- /// </summary>
- /// <returns></returns>
- [HttpPost]
- [Route("InsertLocCntrCg")]
- public string InsertLocCntrCg(LocCntrCg locCntrCg) {
- var db = new SqlHelper<object>().GetInstance();
-
- try {
-
- using (var tran = db.UseTran()) {
- LogHelper.Info("LogCntrCg锛� + JsonConvert.SerializeObject(locCntrCg));
- if (string.IsNullOrEmpty(locCntrCg.LocCode)) return "";
-
- var loc = db.Queryable<TN_Location>().First(a => a.S_CODE == locCntrCg.LocCode);
- if (loc == null) {
- var newLoc = new TN_Location {
- S_CODE = locCntrCg.LocCode,
- S_AREA_CODE = locCntrCg.LocArea ?? ""
- };
-
- if (db.Insertable<TN_Location>(newLoc).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- LogHelper.Info($"鎻掑叆浣嶇疆{locCntrCg.LocCode}澶辫触");
- return "鎻掑叆澶辫触";
- }
-
- loc = newLoc;
- }
-
- if (string.IsNullOrEmpty(locCntrCg.CntrCode)) {
- LogHelper.Info("瀹瑰櫒鍙蜂负绌猴紝涓嶅啀璇诲彇鍚庨潰鐨勬暟鎹�);
- return "";
- }
-
- var locCntrRel = db.Queryable<TN_Loc_Container>().First(a => a.S_LOC_CODE == locCntrCg.LocCode
- && a.S_CNTR_CODE == locCntrCg.CntrCode);
-
- if (locCntrRel == null) {
- var newLocCntrRel = new TN_Loc_Container {
- S_LOC_CODE = locCntrCg.LocCode,
- S_CNTR_CODE = locCntrCg.CntrCode,
- S_CNTR_TYPE = locCntrCg.CntrType ?? ""
- };
-
- loc.N_CURRENT_NUM = 1;
-
- if (db.Insertable<TN_Loc_Container>(newLocCntrRel).ExecuteCommand() <= 0
- && db.Updateable<TN_Location>(loc).UpdateColumns(c => c.N_CURRENT_NUM).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- LogHelper.Info($"鎻掑叆浣嶇疆鎵樼洏鍏崇郴{locCntrCg.LocCode}-{locCntrCg.CntrCode}澶辫触");
- return "鎻掑叆澶辫触";
- }
- }
-
- if (string.IsNullOrEmpty(locCntrCg.ItemCode)) {
- LogHelper.Info("鐗╂枡鍙蜂负绌猴紝涓嶅啀璇诲彇鍚庨潰鐨勬暟鎹�);
- return "";
- }
-
- var cgDetail = db.Queryable<TN_CG_Detail>().First(a => a.S_CNTR_CODE == locCntrCg.CntrCode
- && a.S_ITEM_CODE == locCntrCg.ItemCode);
- if (cgDetail == null) {
- var locList = new List<TN_CG_Detail>();
- locList.Add(new TN_CG_Detail { S_CNTR_CODE = locCntrCg.CntrCode, S_ITEM_CODE = locCntrCg.ItemCode, S_BATCH_NO = locCntrCg.BatchNo ?? "" });
- if (db.Insertable<TN_CG_Detail>(locList).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- LogHelper.Info($"鎻掑叆鎵樼洏鐗╂枡鍏崇郴{locCntrCg.CntrCode}-{locCntrCg}澶辫触");
- return "鎻掑叆澶辫触";
- }
- }
- tran.CommitTran();
- }
-
- return "鎻掑叆鏁版嵁鎴愬姛";
-
- }
- catch (Exception ex) {
- return $"Error reading CSV file: {ex.Message}";
- }
- }
-
- /// <summary>
- /// DEBUG锛氭牴鎹鍣ㄧ墿鏂欎俊鎭〃锛屾彃鍏ュ鍣ㄧ墿鏂欑櫥璁颁俊鎭〃
- /// </summary>
- /// <returns></returns>
- [HttpPost]
- [Route("InsertContainerItemByCgDetail")]
- public string InsertContainerItemByCgDetail(FalseOk _) {
- var db = new SqlHelper<object>().GetInstance();
- try {
- var cgDetailList = db.Queryable<TN_CG_Detail>().ToList();
- var cntrItemList = new List<TN_Container_ItemType>();
- foreach (var cgDetail in cgDetailList) {
- if (db.Queryable<TN_Container_ItemType>().Where(i => i.S_CNTR_CODE == cgDetail.S_CNTR_CODE).Any()) {
- continue;
- }
-
- cntrItemList.Add(new TN_Container_ItemType {
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- });
- }
-
- if (db.Insertable<TN_Container_ItemType>(cntrItemList).ExecuteCommand() <= 0) {
- return "鎻掑叆澶辫触";
- }
-
- return "鎻掑叆鎴愬姛";
- }
- catch (Exception ex) {
-
- LogHelper.InfoEx(ex);
- return ex.Message;
- }
- }
-
- /// <summary>
- /// DEBUG锛氭牴鎹鍣ㄧ墿鏂欎俊鎭〃锛屾彃鍏ュ鍣ㄧ墿鏂欑櫥璁颁俊鎭〃
- /// </summary>
- /// <returns></returns>
- [HttpPost]
- [Route("InsertContainerItem")]
- public string InsertContainerItem(InsertCntrItemInfo cgDetail) {
- var db = new SqlHelper<object>().GetInstance();
- try {
- var cntrItem = new TN_Container_ItemType {
- S_CNTR_CODE = cgDetail.Cntr,
- S_ITEM_CODE = cgDetail.Item,
- };
-
- if (db.Insertable<TN_Container_ItemType>(cntrItem).ExecuteCommand() <= 0) {
- return "鎻掑叆澶辫触";
- }
-
- return "鎻掑叆鎴愬姛";
- }
- catch (Exception ex) {
-
- LogHelper.InfoEx(ex);
- return ex.Message;
- }
- }
-
- /// <summary>
- /// DEBUG锛氭ā鎷熻緭閫佺嚎浜х嚎婊℃墭鐩樹笅绾挎祦绋�+ /// DEBUG:妯℃嫙杈撻�绾夸骇绾挎弧鎵樼洏涓嬬嚎娴佺▼
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
[Route("AddInboundTask")]
public string AddInboundTask(AddInboundTaskInfo model) {
+ return WCSCore.CreateInboundTask(model.StartLoc, model.CntrCode).Content;
+ }
+
+ /// <summary>
+ /// DEBUG:妯℃嫙浜哄伐灏嗘枡绠辨惉杩愬埌浜х嚎涓婄嚎鍙�(鐩存帴淇敼鏁版嵁搴�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("GoodpackToProdLine")]
+ public string GoodpackToProdLine(GoodpackToProdLineInfo model) {
+
var db = new SqlHelper<object>().GetInstance();
- var info = "";
-
- var taskName = TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱;
- var startAreaName = AreaName.B鍖呰鍖�
-
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,
- };
-
- // BEG 姣忔杞閮芥鏌ュ搴斿鍣ㄦ槸鍚﹀凡鐧昏锛岀櫥璁颁繚鎸佷笉鍙橈紝鏈櫥璁板垯鎻掑叆
- // TODO 鍙兘浼氶噰鐢ㄦ瘡娆′笂绾块兘鏇存柊鐨勯�杈戯紝鍚庨潰鍐嶇湅
- var cntrItemRel = db.Queryable<TN_Container_ItemType>()
- .Where(i => i.S_CNTR_CODE == cntrCode).First();
-
- var insertTable = cntrItemRel == null;
-
- if (insertTable) {
- // 鏆傚畾鍦ㄦ弧鎵樹笅绾垮叆搴撶殑鏃跺�锛岀櫥璁版墭鐩樺鍣�鐗╂枡鍙峰叧绯伙紙鍚庨潰鍙兘浼氭敼鎴愮郴缁熺淮鎶わ級
- cntrItemRel = new TN_Container_ItemType {
- S_ITEM_CODE = itemCode,
- S_CNTR_CODE = cntrCode,
- S_CNTR_TYPE = "鎵樼洏",
- };
- }
- // END
-
- var startLoc = db.Queryable<TN_Location>()
- .Where(l => l.S_CODE == startLocCode) // 鎸囧畾锛氳捣鐐硅揣浣嶅彿
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(l => l.N_CURRENT_NUM == 0)
- .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
- .First();
-
+ // 鏌ヨ璧风偣璐т綅:鏁伴噺=0
+ var startLoc = db.Queryable<TN_Location>().LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
+ .Where((l,c) => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.S_CODE == model.StartLoc && l.N_CURRENT_NUM == 1 && c.S_CNTR_CODE == model.CntrCode).First();
if (startLoc == null) {
- info = $"璧风偣浣嶇疆 '{startLocCode}' 涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
- LogHelper.Info(info);
- return info;
+ return $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'!瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=1";
}
- // 缁戝畾璐т綅鍜屽鍣ㄥ彿
- var locCntrRel = new TN_Loc_Container {
- S_LOC_CODE = startLocCode,
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- S_CNTR_TYPE = "鎵樼洏",
- };
-
- var endLoc = db.Queryable<TN_Location>()
- .Where(a => Settings.AreaMap[AreaName.M婊℃墭璐ф灦鍖篯.Contains(a.S_AREA_CODE))
- .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(a => a.N_CURRENT_NUM == 0) // 绛涢�锛氱┖璐т綅
- .OrderBy(l => l.N_LAYER)
- .First();
-
+ // 鏌ヨ缁堢偣璐т綅
+ // Order:鎸夎揣浣嶅眰鏁�浠庡皬鍒板ぇ鎺掑垪
+ var endLoc = db.Queryable<TN_Location>().Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y" && l.N_CURRENT_NUM == 0).First();
if (endLoc == null) {
- info = "绌烘墭鍏ュ簱鏆傛椂娌℃湁鍚堥�鐨勮揣浣嶅彲浠ュ叆搴�;
- LogHelper.Info(info);
- return info;
+ return $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣�瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=0";
}
- var cntId = locCntrRel.S_CNTR_CODE;
- var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+ var locCntrRel = db.Queryable<TN_Loc_Container>().Where(c => c.S_CNTR_CODE == model.CntrCode).First() ;
+ if (locCntrRel == null) {
+ return $"璇ュ鍣ㄤ笉瀛樺湪缁戝畾鐨勮揣浣�";
+ }
- LocationHelper.LockStartLoc(ref startLoc); // 璧风偣鍑哄簱閿�- LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�+ locCntrRel.S_LOC_CODE = model.StartLoc;
+ startLoc.N_CURRENT_NUM = 0;
+ endLoc.N_CURRENT_NUM = 1;
using (var tran = db.Ado.UseTran()) {
- if (db.Insertable<TN_CG_Detail>(cgDetail).ExecuteCommand() <= 0) {
+ if (db.Updateable(startLoc).ExecuteCommand() <= 0 &&
+ db.Updateable(endLoc).ExecuteCommand() <= 0 &&
+ db.Updateable(locCntrRel).ExecuteCommand() <= 0) {
+
tran.RollbackTran();
- info = $"鎻掑叆瀹瑰櫒璐у搧淇℃伅琛ㄥけ璐ワ細鐗╂枡缂栫爜{cgDetail.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cgDetail.S_CNTR_CODE}";
- LogHelper.Info(info);
- return info;
+ return "鏁版嵁搴撴搷浣滃け璐�";
}
- // BEG 鎻掑叆鎴栨洿鏂板鍣ㄤ笌鐗╂枡绫诲瀷鐨勭粦瀹氳〃
- if (insertTable) {
- if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐧昏瀹瑰櫒鐗╂枡绫诲瀷缁戝畾琛ㄥけ璐ワ細鐗╂枡缂栫爜{cntrItemRel.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cntrItemRel.S_CNTR_CODE}";
- LogHelper.Info(info);
- return info;
- }
- }
- //else {
- // if (db.Updateable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // info = $"鐧昏瀹瑰櫒鐗╂枡绫诲瀷缁戝畾琛ㄥけ璐ワ細鐗╂枡缂栫爜{cntrItemRel.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cntrItemRel.S_CNTR_CODE}";
- // LogHelper.Info(info);
- // return info;
- // }
- //}
- // END
-
- if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴琛ㄥけ璐ワ細璐т綅缂栫爜{locCntrRel.S_LOC_CODE}锛屽鍣ㄧ紪鐮亄locCntrRel.S_CNTR_CODE}";
- LogHelper.Info(info);
- 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) {
- tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
- LogHelper.Info(info);
- return info;
- }
-
- if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
- it.N_LOCK_STATE,
- it.S_LOCK_STATE,
- it.S_LOCK_OP,
- it.T_MODIFY
- }).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
- LogHelper.Info(info);
- return info;
- }
-
- if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
- LogHelper.Info(info);
- return info;
- }
-
- tran.CommitTran();
- info = $"鐢熸垚浠诲姟'{taskName}'鎴愬姛锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
- LogHelper.Info(info);
- return info;
+ tran.CommitTran() ;
+ return "鏁版嵁搴撴搷浣滄垚鍔�;
}
-
}
catch (Exception ex) {
- LogHelper.InfoEx(ex);
+
return ex.Message;
}
}
+
+ /// <summary>
+ /// DEBUG:妯℃嫙Erp涓嬪彂鍑哄簱璁″垝鍗�+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [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);
+ }
+
+ /// <summary>
+ /// (鍐呴儴鏂规硶璇峰嬁璋冪敤) 妯℃嫙鍙栬揣瀹屾垚鍙嶉Erp鍥炴姤缁撴灉 (榛樿涓簊uccess)
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [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"
+ };
+ }
+
+ /// <summary>
+ /// (鍐呴儴鏂规硶璇峰嬁璋冪敤) 妯℃嫙浠诲姟鍒涘缓瀹屾垚鍙嶉Erp鍥炴姤缁撴灉 (榛樿涓簊uccess)
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [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 GoodpackToProdLineInfo {
+ public string CntrCode { get; set; }
+ public string StartLoc { get; set; }
+ public string EndLoc { get; set; }
+ }
+
+ 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>
@@ -571,7 +263,7 @@
}
/// <summary>
- /// 妯℃嫙 AGV 浼犻�淇″彿锛岀敤浜庢洿鏀逛换鍔＄姸鎬�+ /// 妯℃嫙 AGV 浼犻�淇″彿,鐢ㄤ簬鏇存敼浠诲姟鐘舵�
/// </summary>
public class UpdateTaskState {
/// <summary>
@@ -582,19 +274,21 @@
/// AGV 灏忚溅鍙� /// </summary>
public string ForkliftNo { set; get; }
- ///// <summary>
- ///// AGV 涓嬩竴涓姸鎬�- ///// </summary>
- //public int NextState { set; get; }
}
- public class FalseOk {
- public bool JumpOut { set; get; } = true;
- }
-
- public class InsertCntrItemInfo {
- public string Cntr { set; get; }
- public string Item { 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;
}
/// <summary>
@@ -604,14 +298,4 @@
public List<ReturnResult> ResultList { set; get; }
}
- public class LocCntrCg {
- public string Note { get; set; } // 浠呯敤浜庡娉�-
- public string LocCode { get; set; }
- public string LocArea { get; set; }
- public string CntrCode { get; set; }
- public string CntrType { get; set; }
- public string ItemCode { get; set; }
- public string BatchNo { get; set; }
- }
}
--
Gitblit v1.9.1