From d20ce230b49932d39ee4ce25e39fd78368c3b28a Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 27 六月 2025 17:26:04 +0800
Subject: [PATCH] 优化配置文件和部分日志打印信息
---
api/ApiHelper.cs | 482 ++++++++++++++++++++++++-----------------------------
1 files changed, 218 insertions(+), 264 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index d851211..94913f5 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -16,7 +16,7 @@
namespace HH.WCS.Mobox3.DSZSH.api {
public class ApiHelper {
/// <summary>
- /// 濂借繍绠�婊＄涓嬬嚎鍏ュ簱(PDA)
+ /// 婊＄涓嬬嚎鍏ュ簱
/// </summary>
/// <remarks>
/// 浜哄伐锛氫骇绾�=>婊＄鎿嶄綔鍖�br/>
@@ -29,9 +29,12 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- const string taskName = TaskName.H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱;
- const string startAreaName = AreaName.M婊＄鎿嶄綔鍖�
- const string endAreaName = AreaName.M婊＄璐ф灦鍖�
+ var taskInfo = Settings.GetTaskInfo(ETask.M婊＄涓嬬嚎鍏ュ簱);
+ var taskName = taskInfo.TaskName;
+ var startAreas = taskInfo.StartAreas;
+ var endAreas = taskInfo.EndAreas;
+
+ var log = $"API锛歿taskName}锛�;
try {
if (model.Num <= 0) {
@@ -40,10 +43,7 @@
return NewSimpleResult(400, info);
}
- var cgDetail = db.Queryable<TN_CG_Detail>()
- .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo)
- .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮")
- .First(); // TODO model 涓�鏁伴噺銆佽鏍兼槸鍚︿篃鍙備笌姣斿 寰呭悗缁姹�+ var cgDetail = db.Queryable<TN_CG_Detail>().Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮").First(); // TODO model 涓�鏁伴噺銆佽鏍兼槸鍚︿篃鍙備笌姣斿 寰呭悗缁姹�
if (cgDetail == null) {
info = $"PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭笉涓�嚧锛� + JsonConvert.SerializeObject(model);
@@ -51,18 +51,13 @@
return NewSimpleResult(1, info);
}
- var startLoc = db.Queryable<TN_Location>()
- .Where(l => l.S_CODE == model.StartLoc)
- .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
- .Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓�- .First();
+ var startLoc = LocationHelper.GetLocQuery(db, 0, startAreas, model.StartLoc).First();
if (startLoc == null) {
- info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
+ info = $"锛氭病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛佽姹傦細鏈笂閿併�鏁伴噺=0銆佽揣鍖哄睘浜嶽{string.Join(", ", startAreas)}]";
LogHelper.Info(info);
return NewSimpleResult(2, info);
- }
+ }
startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�
@@ -72,51 +67,36 @@
S_CNTR_TYPE = "濂借繍绠�,
};
- var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
- .Where(l => l.N_CURRENT_NUM == 0)
- .OrderBy(l => l.N_LAYER) // 鎸夎揣鏋舵渶浣庢帓搴�- .First();// TODO 婊＄鍏ュ簱绠楁硶寰呬紭鍖�-
+ var endLoc = LocationHelper.GetLocQuery(db, 0, endAreas).OrderBy(l => new { l.N_LAYER }).First();
+
if (endLoc == null) {
- info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
+ info = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紝闇�婊¤冻锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲�0";
LogHelper.Info(info);
return NewSimpleResult(3, info);
- }
+ }
LocationHelper.LockStartLoc(ref startLoc);
LocationHelper.LockEndLoc(ref endLoc);
+
var cntId = locCntrRel.S_CNTR_CODE; // 瀹瑰櫒鍙� var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
using (var tran = db.Ado.UseTran()) {
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆銆愯揣浣嶅鍣ㄧ粦瀹氥�琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(locCntrRel);
+ info = $"鎻掑叆璐т綅瀹瑰櫒缁戝畾琛ㄥけ璐ワ細" + JsonConvert.SerializeObject(locCntrRel);
tran.RollbackTran();
LogHelper.Info(info);
return NewSimpleResult(500, 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,
- it.N_CURRENT_NUM, // 璧风偣璐т綅缁戝畾鍚庯紝灏嗚揣浣嶇姸鎬佹洿鏂�- }).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);
return NewSimpleResult(500, 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) {
+ 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);
@@ -144,7 +124,7 @@
}
/// <summary>
- /// 鎵樼洏-绌烘墭鍏ュ簱(PDA)
+ /// 绌烘墭鍏ュ簱
/// </summary>
/// <remarks>
/// 浜哄伐灏嗙┖鎵樼洏閫氳繃鎺ラ┏浣嶅叆搴擄紝闇�鏂扮粦瀹氬鍣ㄨ揣浣�br/>
@@ -156,21 +136,22 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- const string taskName = TaskName.T鎵樼洏_绌烘墭鍏ュ簱;
- const string startAreaName = AreaName.K绌烘墭鍏ュ簱鎺ラ┏鍖�
- const string endAreaName = AreaName.K绌烘墭瀛樻斁鍖�
- const string cntrType = "鎵樼洏";
+ var taskInfo = Settings.GetTaskInfo(ETask.K绌烘墭鍏ュ簱);
+ var taskName = taskInfo.TaskName;
+ var startAreas = taskInfo.StartAreas;
+ var endAreas = taskInfo.EndAreas;
+ var cntrType = "鎵樼洏";
try {
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == model.StartLoc)
- .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => startAreas.Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
.Where(l => l.N_CURRENT_NUM == 0)
.First();
if (startLoc == null) {
- info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶅叿澶囪捣鐐瑰彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
+ info = $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'锛屾垨涓嶅叿澶囪捣鐐瑰彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
LogHelper.Info(info);
return NewSimpleResult(1, info);
}
@@ -221,14 +202,14 @@
startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�
var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => startAreas.Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
.Where(l => l.N_CURRENT_NUM == 0)
.OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL }) // TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
.First();
if (endLoc == null) {
- info = $"鍦ㄣ�{endAreaName}銆戜腑娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝闇�婊¤冻锛氭湭涓婇攣銆佹棤璐х墿";
+ info = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒闇�锛氭湭涓婇攣銆佹棤璐х墿";
LogHelper.Info(info);
return NewSimpleResult(4, info);
}
@@ -239,59 +220,42 @@
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
using (var tran = db.Ado.UseTran()) {
- if (cgDetailOld != null) {
- if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
- info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
- tran.RollbackTran();
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
- }
- }
-
- if (locCntrRelOld != null) {
- if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
- info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
- tran.RollbackTran();
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
- }
- }
-
- if (locOld != null) {
- if (db.Updateable<TN_Location>(locOld).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
- info = $"鏇存柊鏃ц揣浣嶃�瀹瑰櫒鏁伴噺銆戝け璐ワ細" + JsonConvert.SerializeObject(locOld);
- tran.RollbackTran();
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
- }
- }
-
- if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
+ if (cgDetailOld != null && db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
tran.RollbackTran();
+ info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
LogHelper.Info(info);
return NewSimpleResult(500, 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,
- it.N_CURRENT_NUM
- }).ExecuteCommand() <= 0) {
+ if (locCntrRelOld != null && db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
+ LogHelper.Info(info);
+ return NewSimpleResult(500, info);
+ }
+
+ if (locOld != null && db.Updateable<TN_Location>(locOld).UpdateColumns(l => new { l.N_CURRENT_NUM, l.T_MODIFY }).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = $"鏇存柊鏃ц揣浣嶃�瀹瑰櫒鏁伴噺銆戝け璐ワ細" + JsonConvert.SerializeObject(locOld);
+ LogHelper.Info(info);
+ return NewSimpleResult(500, info);
+ }
+
+ if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
+ LogHelper.Info(info);
+ return NewSimpleResult(500, 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, it.N_CURRENT_NUM }).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
return NewSimpleResult(500, 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) {
+ 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);
@@ -319,7 +283,7 @@
}
/// <summary>
- /// 濂借繍绠�绌虹鍏ュ簱(PDA)
+ /// 绌虹鍏ュ簱(濂借繍绠�
/// </summary>
/// <remarks>
/// 浜哄伐锛氱┖绠�=鎼繍==>鍏ュ簱鎺ラ┏浣嶏紝闇�鏂扮粦瀹氬鍣ㄨ揣浣�br/>
@@ -330,21 +294,22 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- const string taskName = TaskName.H濂借繍绠盻绌虹鍏ュ簱;
- const string startAreaName = AreaName.K绌虹鍏ュ簱鎺ラ┏鍖�
- const string endAreaName = AreaName.K绌虹璐ф灦鍖�
+ var taskInfo = Settings.GetTaskInfo(ETask.K绌虹鍏ュ簱);
+ var taskName = taskInfo.TaskName;
+ var startAreas = taskInfo.StartAreas;
+ var endAreas = taskInfo.EndAreas;
const string cntrType = "濂借繍绠�;
try {
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == model.StartLoc)
- .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => startAreas.Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
.Where(l => l.N_CURRENT_NUM == 0) // 缁戝畾鍓� .First();
if (startLoc == null) {
- info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
+ info = $"娌℃湁鎵惧埌璧风偣璐т綅'{model.StartLoc}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
@@ -392,14 +357,14 @@
startLoc.N_CURRENT_NUM = 1; // 缁戝畾鍚�
var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => endAreas.Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
.Where(l => l.N_CURRENT_NUM == 0)
.OrderBy(l => new { l.N_LAYER }) // TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀� .First();
if (endLoc == null) {
- info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�;
+ info = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒闇�锛氭湭涓婇攣銆佹棤璐х墿";
LogHelper.Info(info);
return NewSimpleResult(4, info);
}
@@ -412,59 +377,42 @@
using (var tran = db.Ado.UseTran()) {
// 瀛樺湪鏃с�鐗╂枡鏄庣粏銆戣〃鏃讹紝鍒犻櫎鏃ц〃
- if (cgDetailOld != null) {
- if (db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
- info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
- tran.RollbackTran();
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
- }
+ if (cgDetailOld != null && db.Deleteable<TN_CG_Detail>(cgDetailOld).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = $"鍒犻櫎銆愭棫鐗╂枡淇℃伅銆戝け璐ワ細" + JsonConvert.SerializeObject(cgDetailOld);
+ LogHelper.Info(info);
+ return NewSimpleResult(500, info);
}
// 瀛樺湪鏃с�璐т綅瀹瑰櫒缁戝畾銆戣〃鏃讹紝鍒犻櫎鏃ц〃
- if (locCntrRelOld != null) {
- if (db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
- info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
- tran.RollbackTran();
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
- }
- }
-
- if (locOld != null) {
- if (db.Updateable<TN_Location>(locOld).UpdateColumns(l => l.N_CURRENT_NUM).ExecuteCommand() <= 0) {
- info = $"鏇存柊鏃ц揣浣嶃�瀹瑰櫒鏁伴噺銆戝け璐ワ細" + JsonConvert.SerializeObject(locOld);
- tran.RollbackTran();
- LogHelper.Info(info);
- return NewSimpleResult(500, info);
- }
- }
-
- if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
- info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
+ if (locCntrRelOld != null && db.Deleteable<TN_Loc_Container>(locCntrRelOld).ExecuteCommand() <= 0) {
tran.RollbackTran();
+ info = $"鍒犻櫎銆愭棫璐т綅瀹瑰櫒鍏崇郴銆戝け璐ワ細" + JsonConvert.SerializeObject(locCntrRelOld);
LogHelper.Info(info);
return NewSimpleResult(500, 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,
- it.N_CURRENT_NUM
- }).ExecuteCommand() <= 0) {
+ if (locOld != null && db.Updateable<TN_Location>(locOld).UpdateColumns(l => l.N_CURRENT_NUM).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = $"鏇存柊鏃ц揣浣嶃�瀹瑰櫒鏁伴噺銆戝け璐ワ細" + JsonConvert.SerializeObject(locOld);
+ LogHelper.Info(info);
+ return NewSimpleResult(500, info);
+ }
+
+ if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = $"鎻掑叆銆愯揣浣嶅鍣ㄥ叧绯汇�澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
+ LogHelper.Info(info);
+ return NewSimpleResult(500, 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, it.N_CURRENT_NUM }).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
return NewSimpleResult(500, 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) {
+ 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);
@@ -492,7 +440,7 @@
}
/// <summary>
- /// 鎵樼洏-绌烘墭涓婄嚎(PDA)
+ /// 绌烘墭涓婄嚎鍑哄簱
/// </summary>
/// <remarks>
/// 浜哄伐鏍规嵁褰撳墠鐢熶骇鐗╂枡鎵�渶鐨勫鍣ㄧ被鍨嬶紝鍛煎彨AGV浠庣┖瀹瑰櫒璐ф灦涓彨涓�釜绗﹀悎瑕佹眰鐨勬墭鐩�@@ -503,9 +451,10 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- const string taskName = TaskName.T鎵樼洏_绌烘墭涓婄嚎;
- const string startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
- const string endAreaName = AreaName.B鍖呰鍖�
+ var taskInfo = Settings.GetTaskInfo(ETask.K绌烘墭涓婄嚎鍑哄簱);
+ var taskName = taskInfo.TaskName;
+ var startAreas = taskInfo.StartAreas;
+ var endAreas = taskInfo.EndAreas;
const string cntrType = "鎵樼洏";
try {
@@ -544,25 +493,25 @@
var startLoc = db.Queryable<TN_Location>()
.LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
.Where((l, c) => c.S_CNTR_CODE == model.CntId)
- .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => startAreas.Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
.Where(l => l.N_CURRENT_NUM == 1)
.First();
if (startLoc == null) {
- info = $"鍦�{startAreaName}'涓紝鎵句笉鍒伴�鐢ㄤ簬{model.ItemCode}鐗╂枡銆佷笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
+ info = $"鎵句笉鍒伴�鐢ㄤ簬{model.ItemCode}鐗╂枡銆佷笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
LogHelper.Info(info);
return NewSimpleResult(3, info);
}
var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => endAreas.Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
.Where(l => l.N_CURRENT_NUM == 0)
.First();
if (endLoc == null) {
- info = $"鍦�{endAreaName}'涓紝鎵句笉鍒板悎閫傜殑銆愮粓鐐硅揣浣嶃�锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
+ info = $"鎵句笉鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
LogHelper.Info(info);
return NewSimpleResult(4, info);
}
@@ -587,24 +536,14 @@
}
}
- 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 }).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
return NewSimpleResult(500, 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) {
+ 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);
@@ -632,7 +571,7 @@
}
/// <summary>
- /// 濂借繍绠�绌虹涓婄嚎(PDA)
+ /// 绌虹涓婄嚎鍑哄簱
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -640,9 +579,10 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- const string taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎;
- const string startAreaName = AreaName.K绌虹璐ф灦鍖�
- const string endAreaName = AreaName.K绌虹鎿嶄綔鍖�
+ var taskInfo = Settings.GetTaskInfo(ETask.K绌虹涓婄嚎鍑哄簱);
+ var taskName = taskInfo.TaskName;
+ var startAreas = taskInfo.StartAreas;
+ var endAreas = taskInfo.EndAreas;
const string cntrType = "濂借繍绠�;
try {
@@ -664,25 +604,25 @@
var startLoc = db.Queryable<TN_Location>()
.LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
.Where((l, c) => c.S_CNTR_CODE == model.CntId && c.S_CNTR_TYPE == "濂借繍绠�)
- .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => startAreas.Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y")
.Where(l => l.N_CURRENT_NUM == 1)
.First();
if (startLoc == null) {
- info = $"鍦�{startAreaName}'涓紝鎵句笉鍒板瓨鏀惧鍣ㄧ紪鐮�{model.CntId}鐨勭┖濂借繍绠辩殑銆愯捣鐐硅揣浣嶃�锛屾垨涓嶆弧瓒筹細鏈笂閿併�褰撳墠鏁伴噺=1";
+ info = $"娌℃湁鎵惧埌璧风偣璐т綅'{model.CntId}鐨勭┖濂借繍绠辩殑銆愯捣鐐硅揣浣嶃�锛屾垨涓嶆弧瓒筹細鏈笂閿併�褰撳墠鏁伴噺=1";
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => endAreas.Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
.Where(l => l.N_CURRENT_NUM == 0)
.First();
if (endLoc == null) {
- info = $"鍦�{endAreaName}'涓紝鎵句笉鍒板悎閫傜殑銆愮粓鐐硅揣浣嶃�锛岄渶瑕佹弧瓒筹細鏈笂閿併�褰撳墠鏁伴噺=0";
+ info = $"娌℃湁鎵惧埌鍚堥�鐨勭粓鐐硅揣浣嶏紒闇�锛氭湭涓婇攣銆佹棤璐х墿";
LogHelper.Info(info);
return NewSimpleResult(4, info);
}
@@ -738,9 +678,8 @@
}
}
-
/// <summary>
- /// 鎶芥-鍚堟牸鍥炲簱(PDA)
+ /// 鎶芥鍚堟牸鍥炲簱
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -748,9 +687,10 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- const string taskName = TaskName.C鎶芥_鍚堟牸鍥炲簱;
- const string startAreaName = AreaName.C鎶芥鍖�
- var endAreaName = "";
+ var taskInfo = Settings.GetTaskInfo(ETask.C鎶芥鍚堟牸鍥炲簱);
+ var taskName = taskInfo.TaskName;
+ var startAreas = taskInfo.StartAreas;
+ var endAreas = taskInfo.EndAreas;
try {
var cgDetail = db.Queryable<TN_CG_Detail>()
@@ -777,38 +717,30 @@
.Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
.Where(l => l.N_CURRENT_NUM == 1)
- .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => startAreas.Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
- info = $"鍦�{startAreaName}'涓病鏈夋壘鍒板鍣▄model.CntrCode}鐨勮捣鐐硅揣浣嶏紝鎴栦笉鍏峰鍙栬揣瑕佹眰锛氭湭涓婇攣銆佹湁璐х墿";
+ info = $"娌℃湁鎵惧埌瀹瑰櫒{model.CntrCode}鐨勮捣鐐硅揣浣嶏紝鎴栦笉鍏峰鍙栬揣瑕佹眰锛氭湭涓婇攣銆佹湁璐х墿";
LogHelper.Info(info);
return NewSimpleResult(4, info);
}
TN_Location endLoc = null;
if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
- endAreaName = AreaName.M婊℃墭璐ф灦鍖�
- endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(l => l.N_CURRENT_NUM == 0) // 绛涢�锛氱┖璐т綅
- .First();
+ endAreas = taskInfo.EndAreas_Pallet;
+ endLoc = LocationHelper.GetLocQuery(db, 0, endAreas).First();
}
else if (locCntrRel.S_CNTR_TYPE == "濂借繍绠�) {
- endAreaName = AreaName.M婊＄璐ф灦鍖�
- endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
- .Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- .Where(l => l.N_CURRENT_NUM == 0)
- .First();
+ endAreas = taskInfo.EndAreas_Goodpack;
+ endLoc = LocationHelper.GetLocQuery(db, 0, endAreas).First();
}
else {
return NewSimpleResult(-1, $"鎵樼洏绫诲瀷{locCntrRel.S_CNTR_TYPE}涓嶅悎娉曪細鎵樼洏鍙穥locCntrRel.S_CNTR_CODE}");
}
if (endLoc == null) {
- info = $"鍦ㄣ�{endAreaName}銆戜腑娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝鎴栦笉婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲忎负 0";
+ info = $"娌℃湁鎵惧埌鍚堥�鐨勩�缁堢偣璐т綅銆戯紝鎴栦笉婊¤冻瑕佹眰锛氭湭涓婇攣銆佸綋鍓嶅鍣ㄦ暟閲忎负 0";
LogHelper.Info(info);
return NewSimpleResult(3, info);
}
@@ -824,32 +756,21 @@
LocationHelper.LockEndLoc(ref endLoc); // 缁堢偣鍏ュ簱閿�
using (var tran = db.Ado.UseTran()) {
- if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it =>
- new { it.N_ITEM_STATE, it.S_ITEM_STATE, it.T_MODIFY }).ExecuteCommand() <= 0) {
+ if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it => new { it.N_ITEM_STATE, it.S_ITEM_STATE, it.T_MODIFY }).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐢熸垚'{taskName}'澶辫触锛氫慨鏀圭墿鏂欑姸鎬佷负'鍚堟牸'澶辫触";
LogHelper.Info(info);
return NewSimpleResult(500, 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 }).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣�{startLoc.S_CODE}'閿佺姸鎬佸け璐�;
LogHelper.Info(info);
return NewSimpleResult(500, 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) {
+ 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);
@@ -877,7 +798,7 @@
}
/// <summary>
- /// 鎶芥-涓嶅悎鏍肩Щ搴�PDA)
+ /// 鎶芥涓嶅悎鏍肩Щ搴� /// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -885,14 +806,14 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- const string taskName = TaskName.C鎶芥_涓嶅悎鏍肩Щ搴�
- const string startAreaName = AreaName.C鎶芥鍖�
- const string endAreaName = AreaName.C鎶芥寮傚父鍖�
+ const ETask eTask = ETask.C鎶芥涓嶅悎鏍肩Щ搴�
+ var taskName = Settings.GetTaskInfo(eTask).TaskName;
+ var startAreas = Settings.GetTaskInfo(eTask).StartAreas;
+ var endAreas = Settings.GetTaskInfo(eTask).EndAreas;
try {
-
- if (!Settings.AreaMap[endAreaName].Contains(model.EndArea)) {
- info = $"杈撳叆鐨勭粓鐐瑰簱鍖�{model.EndArea}'涓嶅睘浜�{endAreaName}'!";
+ if (!startAreas.Contains(model.EndArea)) {
+ info = $"缁堢偣搴撳尯'{model.EndArea}'涓嶆弧瓒虫潯浠讹紒闇�锛氳揣鍖哄睘浜嶽{string.Join(", ", startAreas)}]";
LogHelper.Info(info);
return NewSimpleResult(1, info);
}
@@ -919,13 +840,13 @@
var startLoc = db.Queryable<TN_Location>()
.Where(l => l.S_CODE == locCntrRel.S_LOC_CODE)
- .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => startAreas.Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
.Where(l => l.N_CURRENT_NUM == 1)
.First();
if (startLoc == null) {
- info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣�{locCntrRel.S_LOC_CODE}'锛屾垨涓嶆弧瓒宠姹傦細鏈笂閿併�褰撳墠瀹瑰櫒鏁伴噺=0";
+ info = $"璧风偣璐т綅' {locCntrRel.S_LOC_CODE} '涓嶆弧瓒虫潯浠讹紒闇�锛氳揣鍖哄睘浜嶽 {string.Join(", ", startAreas)} ]";
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
@@ -1005,7 +926,7 @@
}
/// <summary>
- /// 浣欐枡鍥炲簱/灏剧鍥炲簱(PDA)
+ /// 灏炬枡鍥炲簱/浣欐枡鍥炲簱
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
@@ -1013,8 +934,10 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- const string taskName = TaskName.W灏剧鍥炲簱;
- var endAreaName = "";
+ var taskInfo = Settings.GetTaskInfo(ETask.W灏炬枡鍥炲簱);
+ var taskName = taskInfo.TaskName;
+ var startAreas = taskInfo.StartAreas;
+ List<string> endAreas = null;
try {
var startLoc = db.Queryable<TN_Location>()
@@ -1041,17 +964,17 @@
TN_Location endLoc = null;
if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
- endAreaName = AreaName.M婊℃墭璐ф灦鍖�
+ endAreas = taskInfo.EndAreas_Pallet;
endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => endAreas.Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
.Where(l => l.N_CURRENT_NUM == 0)
.First();
}
else if (locCntrRel.S_CNTR_TYPE == "濂借繍绠�){
- endAreaName = AreaName.M婊＄璐ф灦鍖�
+ endAreas = taskInfo.EndAreas_Goodpack;
endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[endAreaName].Contains(l.S_AREA_CODE))
+ .Where(l => endAreas.Contains(l.S_AREA_CODE))
.Where(l => l.N_LOCK_STATE == 0 && l.S_LOCK_STATE == "鏃� && l.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
.Where(l => l.N_CURRENT_NUM == 0)
.First();
@@ -1126,7 +1049,8 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- const string taskName = TaskName.C鎴愬搧鑳跺嚭搴�
+ var taskInfo = Settings.GetTaskInfo(ETask.C鎴愬搧鑳跺嚭搴�;
+ var taskName = taskInfo.TaskName;
try {
var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
@@ -1197,7 +1121,8 @@
var db = new SqlHelper<object>().GetInstance();
var info = "";
- const string taskName = TaskName.C鎴愬搧鑳跺嚭搴�
+ var taskInfo = Settings.GetTaskInfo(ETask.C鎴愬搧鑳跺嚭搴�;
+ var taskName = taskInfo.TaskName;
try {
var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "CKD");
@@ -1337,7 +1262,7 @@
private static string GenerateOrderNo(string snType, string prefix) {
var id = SYSHelper.GetSerialNumber(snType, prefix);
var date = DateTime.Now.ToString("yyMMdd");
- return $"{prefix}{date}{id.ToString().PadLeft(4, '0')}";
+ return $"{prefix}{date}-{id.ToString().PadLeft(4, '0')}";
}
/// <summary>
@@ -1437,15 +1362,23 @@
var info = "";
try {
// 鍙傛暟鍚堟硶鎬х‘璁ら儴鍒嗭細閿欒缂栫爜锛�00
- if (model.pzsl <= 0) {
- info = $"鐗╂枡鏁伴噺(pzsl){model.pzsl}涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬 0";
+ if (model.pzjs <= 0) {
+ info = $"鐗╂枡鏁伴噺(pzjs){model.pzjs}涓嶅悎娉曪細鐗╂枡鏁伴噺搴旇澶т簬 0";
LogHelper.Info(info);
return NewErpResult(400, info);
}
- var outboundPlan = new TN_Outbound_Plan {
+ var outboundPlan = db.Queryable<TN_Outbound_Plan>()
+ .Where(p => p.JHDH == model.jhdh).First();
+ if (outboundPlan != null) {
+ info = $"璁″垝鍗曞彿{model.jhdh}宸插湪鏁版嵁搴撲腑瀛樺湪";
+ LogHelper.Info(info);
+ return NewErpResult(1, info);
+ }
+
+ outboundPlan = new TN_Outbound_Plan {
JHDH = model.jhdh, // 璁″垝鍗曞彿锛堝敮涓�爣璇嗭級
- CKZT = model.ckzt, // 鍑哄簱鐘舵�
+ CKZT = model.ckzt, // 鍑哄簱鐘舵�锛堥渶瑕佽繑鍥烇級
JHLB = model.jhlb, // 璁″垝绫诲埆
CKDH = model.ckdh, // 鍙傝�鍗曞彿
CPH = model.cph, // 杞︾墝鍙�@@ -1456,9 +1389,9 @@
CPLB = model.cplb, // 浜у搧绫诲埆
CPLBMX = model.cplbmx, // 浜у搧绫诲埆鏄庣粏
PP = model.pp, // 鍝佺墝
- DJ = model.dj, // 绛夌骇
+ DJ = model.dj, // 绛夌骇锛堥渶瑕佽繑鍥烇級
GH = model.gh, // 缃愬彿
- PH = model.ph, // 鎵瑰彿
+ PH = model.ph, // 鎵瑰彿锛堥渶瑕佽繑鍥烇級
BZLX = model.bzlx, // 鍖呰绫诲瀷
PZDH = model.pzdh, // 娲捐鍗曞彿
PZD_DW = model.pzd_dw, // 娲捐鍗曞崟浣�@@ -1471,15 +1404,15 @@
PZ_ZFRQ = model.pz_zfrq, // 娲捐浣滃簾鏃ユ湡
PZ_BZ = model.pz_bz, // 娲捐澶囨敞
CKDBH = model.ckdbh, // 鍑哄簱鍗曠紪鍙�- SFJS = model.sfjs, // 瀹炲彂浠舵暟
- SFSL = model.sfsl, // 瀹炲彂鏁伴噺
- SFCS = model.sfcs, // 瀹炲彂杞︽暟
- ZCSJ = model.zcsj, // 瑁呰溅鏃堕棿
- JLDW = model.jldw, // 璁￠噺鍗曚綅
- FHRQ = model.fhrq, // 鍙戣揣鏃ユ湡
- CKDM = model.ckdm, // 浠撳簱浠ｇ爜
- FHR = model.fhr, // 鍙戣揣浜�- CZYDM = model.czydm, // 鎿嶄綔鍛�+ SFJS = model.sfjs, // 瀹炲彂浠舵暟锛堥渶瑕佽繑鍥烇級
+ SFSL = model.sfsl, // 瀹炲彂鏁伴噺锛堥渶瑕佽繑鍥烇級
+ SFCS = model.sfcs, // 瀹炲彂杞︽暟锛堥渶瑕佽繑鍥烇級
+ ZCSJ = model.zcsj, // 瑁呰溅鏃堕棿锛堥渶瑕佽繑鍥烇級
+ JLDW = model.jldw, // 璁￠噺鍗曚綅锛堥渶瑕佽繑鍥烇級
+ FHRQ = model.fhrq, // 鍙戣揣鏃ユ湡锛堥渶瑕佽繑鍥烇級
+ CKDM = model.ckdm, // 浠撳簱浠ｇ爜锛堥渶瑕佽繑鍥烇級
+ FHR = model.fhr, // 鍙戣揣浜猴紙闇�杩斿洖锛�+ CZYDM = model.czydm, // 鎿嶄綔鍛橈紙闇�杩斿洖锛� SHR_USERNAME = model.shr_username, // 瀹℃牳浜� SHRQ = model.shrq, // 瀹℃牳鏃ユ湡
ZFBJ = model.zfbj, // 浣滃簾鏍囪
@@ -1488,53 +1421,74 @@
SHDW = model.shdw, // 鏀惰揣鍗曚綅
YSDW = model.ysdw, // 杩愯緭鍗曚綅
LXR = model.lxr, // 鑱旂郴浜�- RY_ZXG = model.ry_zxg, // 瑁呭嵏宸�- RY_CCSJ = model.ry_ccsj, // 鍙夎溅鍙告満
+ RY_ZXG = model.ry_zxg, // 瑁呭嵏宸ワ紙闇�杩斿洖锛�+ RY_CCSJ = model.ry_ccsj, // 鍙夎溅鍙告満锛堥渶瑕佽繑鍥烇級
ERPHX_JHDH = model.erphx_jhdh, // erp浜よ揣鍗曞彿
ERPHX_WLBM = model.erphx_wlbm, // erp鐗╂枡缂栫爜
ERPHX_WLMC = model.erphx_wlmc, // erp鐗╂枡鍚嶇О
ERPHX_CJRQ = model.erphx_cjrq, // erp鍒涘缓鏃ユ湡
- HW = model.hw, // 璐т綅
- HWZT = model.hwzt // 璐т綅鐘舵�
+ HW = model.hw, // 璐т綅锛堥渶瑕佽繑鍥烇級
+ HWZT = model.hwzt // 璐т綅鐘舵�锛堥渶瑕佽繑鍥烇級
};
- var cgDetailList = SelectCgByTotalQty(
- qty: (int)model.pzsl,
- itemCode: model.cpdm,
- batchNo: model.ph
- );
+ //var cgDetailList = SelectCgByTotalQty(
+ // qty: (int)model.pzsl,
+ // itemCode: model.cpdm,
+ // batchNo: model.ph
+ // );
- if (cgDetailList.Count == 0) {
- info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
+ //if (cgDetailList.Count == 0) {
+ // info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
+ // LogHelper.Info(info);
+ // return NewErpResult(3, info);
+ //}
+
+ var cgDetail = db.Queryable<TN_CG_Detail>()
+ .Where(d => d.S_ITEM_CODE == model.cpdm && d.N_ITEM_NUM >= model.pzjs).First();
+ if (cgDetail == null ) {
+ info = $"娌℃湁鍚堥�鐨勭墿鏂欏彲浠ユ弧瓒筹細鐗╂枡缂栫爜={model.cpdm}锛岀墿鏂欐暟閲�={model.pzjs}";
LogHelper.Info(info);
- return NewErpResult(3, info);
+ return NewErpResult(2, info);
}
var order = new TN_Outbound_Order {
S_NO = orderNo,
+ //S_ITEM_CODE = model.cpdm,
+ //S_BATCH = model.ph,
+ //N_END_NUM = (int)model.pzsl,
S_ITEM_CODE = model.cpdm,
- S_BATCH = model.ph,
- N_END_NUM = (int)model.pzsl,
- //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
- S_END_AREA = model.ysfs == "姹借溅" ? "QCCKQ" : "HCCKQ", // 鏆傛椂鐢ㄨ繍杈撴柟寮忥紙鐏溅/姹借溅锛夋潵鍖哄垎缁堢偣璐у尯
+ S_BATCH = cgDetail.S_BATCH_NO,
+ N_END_NUM = (int)model.pzjs,
+ S_END_AREA = "QCCKQ", // ERP涓嬪彂鍑哄簱浠诲姟涓烘苯杞﹀嚭搴撳尯
S_BS_NO = model.jhdh,
S_BS_TYPE = "ERP",
};
var detailList = new List<TN_Outbound_Detail>();
- foreach (var cgDetail in cgDetailList) {
- var detail = new TN_Outbound_Detail {
- S_OO_NO = orderNo,
- S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- S_BATCH_NO = cgDetail.S_BATCH_NO,
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- N_COUNT = cgDetail.N_ITEM_NUM,
- S_END_AREA = order.S_END_AREA, // order涓篸etail鐨勬瘡涓�釜璐т綅璁剧疆缁堢偣鍊�- S_BS_NO = order.S_BS_NO,
- S_BS_TYPE= order.S_BS_TYPE,
- };
- detailList.Add(detail);
- }
+ //foreach (var cgDetail in cgDetailList) {
+ // var detail = new TN_Outbound_Detail {
+ // S_OO_NO = orderNo,
+ // S_ITEM_CODE = cgDetail.S_ITEM_CODE,
+ // S_BATCH_NO = cgDetail.S_BATCH_NO,
+ // S_CNTR_CODE = cgDetail.S_CNTR_CODE,
+ // N_COUNT = cgDetail.N_ITEM_NUM,
+ // S_END_AREA = order.S_END_AREA, // order涓篸etail鐨勬瘡涓�釜璐т綅璁剧疆缁堢偣鍊�+ // S_BS_NO = order.S_BS_NO,
+ // S_BS_TYPE= order.S_BS_TYPE,
+ // };
+ // detailList.Add(detail);
+ //}
+ var detail = new TN_Outbound_Detail {
+ S_OO_NO = orderNo,
+ S_ITEM_CODE = cgDetail.S_ITEM_CODE,
+ S_BATCH_NO = cgDetail.S_BATCH_NO,
+ S_CNTR_CODE = cgDetail.S_CNTR_CODE,
+ N_COUNT = cgDetail.N_ITEM_NUM,
+ S_END_AREA = order.S_END_AREA, // order涓篸etail鐨勬瘡涓�釜璐т綅璁剧疆缁堢偣鍊�+ S_BS_NO = order.S_BS_NO,
+ S_BS_TYPE = order.S_BS_TYPE,
+ };
+ detailList.Add(detail);
using (var tran = db.Ado.UseTran()) {
if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
@@ -1561,7 +1515,7 @@
tran.CommitTran();
}
- info = $"鐢熸垚鍑哄簱鍗曟垚鍔�;
+ info = $"鐢熸垚鍑哄簱鍗曟垚鍔燂細" + JsonConvert.SerializeObject(order) + "\n鍑哄簱鍗曟槑缁嗭細" +JsonConvert.SerializeObject(detail);
LogHelper.Info(info);
return NewErpResult(0, info);
}
--
Gitblit v1.9.1