From 2ca90a404fa1ab94eb6374f50c6ddd47a2b7f0e6 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 31 七月 2025 17:23:57 +0800
Subject: [PATCH] 删除有问题的TCP旧代码, 优化事务处理和ERP数据模型
---
api/DebugController.cs | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/api/DebugController.cs b/api/DebugController.cs
index 73661eb..4a2455b 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -3,17 +3,13 @@
using System.IO;
using System.Runtime.ConstrainedExecution;
using System.Web.Http;
-
using HH.WCS.Mobox3.DSZSH.core;
using HH.WCS.Mobox3.DSZSH.device;
using HH.WCS.Mobox3.DSZSH.models;
using HH.WCS.Mobox3.DSZSH.util;
using HH.WCS.Mobox3.DSZSH.wms;
-
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;
@@ -113,7 +109,7 @@
try {
// 鏌ヨ璧风偣璐т綅:鏁伴噺=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();
+ .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) {
return $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'!瑕佹眰:閿佺姸鎬�'鏃�,褰撳墠瀹瑰櫒鏁伴噺=1";
}
@@ -143,12 +139,11 @@
return "鏁版嵁搴撴搷浣滃け璐�";
}
- tran.CommitTran() ;
+ tran.CommitTran();
return "鏁版嵁搴撴搷浣滄垚鍔�;
}
}
catch (Exception ex) {
-
return ex.Message;
}
}
@@ -160,18 +155,18 @@
/// <returns></returns>
[HttpPost]
[Route("TestErpSendOutboundPlan")]
- public ErpResult TestErpSendOutboundPlan(TestErpSendOutboundPlanInfo model) {
+ public ErpModel.ErpResult TestErpSendOutboundPlan(TestErpSendOutboundPlanInfo model) {
var apiName = "ERP涓嬪彂鍑哄簱璁″垝鍗�;
//LogHelper.InfoApi(apiName, model);
- var erpModel = new ErpSendOutboundPlanInfo();
+ var erpModel = new ErpModel.ErpSendOutboundPlanInfo();
erpModel.jhdh = model.PlanNo;
erpModel.cpdm = model.ItemCode;
erpModel.pzjs = model.ItemNum;
LogHelper.InfoApi(apiName, erpModel);
- return ApiHelper.ErpSendOutboundPlan(erpModel);
+ return ErpService.ErpSendOutboundPlan(erpModel);
}
/// <summary>
@@ -181,7 +176,7 @@
/// <returns></returns>
[HttpPost]
[Route("PickUpReturn")]
- public TestErpResult PickUpReturn(PickUpReturnErpInfo model) {
+ public TestErpResult PickUpReturn(ErpModel.PickUpReturnErpInfo model) {
if (model.sfjs == 0) {
return new TestErpResult {
code = 1,
@@ -202,7 +197,7 @@
/// <returns></returns>
[HttpPost]
[Route("CreateTaskReturn")]
- public TestErpResult CreateTaskReturn(CreateTaskReturnErpInfo model) {
+ public TestErpResult CreateTaskReturn(ErpModel.CreateTaskReturnErpInfo model) {
if (model.hw == "") {
return new TestErpResult {
code = 1,
--
Gitblit v1.9.1