From de8cd5585ba690902333cf4ce9aa5dbc7eb9acf6 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期三, 28 五月 2025 17:29:33 +0800
Subject: [PATCH] 根据业务重构库区，增加记录表，开始ERP下发反馈逻辑开发
---
api/ApiHelper.cs | 318 +++++++++++-----------------------------------------
1 files changed, 69 insertions(+), 249 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index f844780..beda0c6 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -9,6 +9,8 @@
using HH.WCS.Mobox3.DSZSH.wms;
using Newtonsoft.Json;
+using Org.BouncyCastle.Asn1.Tsp;
+
using SqlSugar;
using Swashbuckle.Swagger;
@@ -26,7 +28,7 @@
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
- var taskName = TaskName.濂借繍绠盻婊＄涓嬬嚎鍏ュ簱; // 鐢ㄤ簬鐢熸垚浠诲姟绫诲瀷銆佹墦鍗版棩蹇椾俊鎭�+ var taskName = TaskName.H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱; // 鐢ㄤ簬鐢熸垚浠诲姟绫诲瀷銆佹墦鍗版棩蹇椾俊鎭� var db = new SqlHelper<object>().GetInstance();
var info = "";
try {
@@ -48,10 +50,11 @@
.Where(l => l.S_CODE == model.StartLoc) // 鎸囧畾锛氳捣鐐硅揣浣嶅彿
.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[AreaName.M婊＄鎿嶄綔鍖篯.Contains(l.S_AREA_CODE))
.First();
if (startLoc == null) {
- info = $"璧风偣浣嶇疆 '{model.StartLoc}' 涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
+ info = $"鍦�{AreaName.M婊＄鎿嶄綔鍖簘'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
LogHelper.Info(info);
return NewSimpleResult(3, info);
}
@@ -65,7 +68,7 @@
// TODO 婊＄鍏ュ簱绠楁硶寰呬紭鍖� var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.婊℃墭瀛樻斁鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[AreaName.M婊＄璐ф灦鍖篯.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)
@@ -82,6 +85,21 @@
LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿� LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+
+ // TODO
+ var record = new TN_Record_Table {
+ S_ITEM_CODE = cgDetail.S_ITEM_CODE,
+ S_BATCH_NO= cgDetail.S_BATCH_NO,
+ S_ITEM_NAME= cgDetail.S_ITEM_NAME,
+ S_START_LOC = startLoc.S_CODE,
+ S_END_LOC = endLoc.S_CODE,
+ S_CNTR_CODE = cntId,
+ S_ITEM_SPEC = cgDetail.S_ITEM_SPEC,
+ S_NET_WEIGHT= cgDetail.S_NET_WEIGHT,
+ S_QUALITY_GRADE= cgDetail.S_QUALITY_GRADE,
+ S_STANDARD = cgDetail.S_STANDARD,
+ S_TASK_NO = task.S_CODE,
+ };
using (var tran = db.Ado.UseTran()) {
if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
@@ -241,7 +259,7 @@
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
- var taskName = TaskName.鎵樼洏_绌烘墭鍏ュ簱;
+ var taskName = TaskName.T鎵樼洏_绌烘墭鍏ュ簱;
var db = new SqlHelper<object>().GetInstance();
var info = "";
try {
@@ -250,6 +268,7 @@
.Where(l => l.S_CODE == model.StartLoc) // 鎸囧畾锛氳捣鐐硅揣浣� .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[AreaName.K绌烘墭鍏ュ簱鎺ラ┏鍖篯.Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
@@ -278,7 +297,7 @@
// TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.绌烘墭瀛樻斁鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[AreaName.K绌烘墭瀛樻斁鍖篯.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, row=SqlFunc.Desc(l.S_AREA_CODE) })
@@ -353,7 +372,7 @@
/// </summary>
/// <returns></returns>
public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) {
- var taskName = TaskName.濂借繍绠盻绌虹鍏ュ簱;
+ var taskName = TaskName.H濂借繍绠盻绌虹鍏ュ簱;
var db = new SqlHelper<object>().GetInstance();
var info = "";
try {
@@ -361,6 +380,7 @@
.Where(l => l.S_CODE == model.StartLoc)
.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[AreaName.K绌虹鍏ュ簱鎺ラ┏鍖篯.Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
@@ -389,7 +409,7 @@
// TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀� var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.绌虹瀛樻斁鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[AreaName.K绌虹璐ф灦鍖篯.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 })
@@ -463,9 +483,8 @@
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
- var taskName = TaskName.鎵樼洏_绌烘墭涓婄嚎;
+ var taskName = TaskName.T鎵樼洏_绌烘墭涓婄嚎;
var db = new SqlHelper<object>().GetInstance();
- var taskInfo = Settings.TaskMap[taskName];
var info = "";
try {
// 鎵剧鍚堢墿鏂欎俊鎭殑璐т綅
@@ -505,7 +524,7 @@
var startLoc = db.Queryable<TN_Location>()
.LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) // 鑱旇〃锛氳揣浣嶅鍣ㄥ叧绯昏〃
- .Where(l => taskInfo.StartAreas.Contains(l.S_AREA_CODE)) // 闄愬畾鍦ㄧ┖鎵樺瓨鏀惧尯涓壘瀹瑰櫒璐т綅
+ .Where(l => Settings.AreaMap[AreaName.K绌烘墭瀛樻斁鍖篯.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) // 绛涢�锛氭湁璐ц揣浣� .Where((l, c) => c.S_CNTR_CODE == model.CntId) // 鎵炬寚瀹氬鍣ㄥ彿
@@ -518,8 +537,7 @@
}
var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.鍖呰鍖篯.Contains(l.S_AREA_CODE))
- .Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE))
+ //.Where(l => Settings.AreaMap[AreaName.B鍖呰鍖篯.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();
@@ -587,14 +605,13 @@
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult EmptyOnlineGoodpack(EmptyOnlineGoodpackInfo model) {
- var taskName = TaskName.濂借繍绠盻绌虹涓婄嚎;
+ var taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎;
var db = new SqlHelper<object>().GetInstance();
- var taskInfo = Settings.TaskMap[taskName];
var info = "";
try {
var startLoc = db.Queryable<TN_Location>()
.LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
- .Where(l => taskInfo.StartAreas.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[AreaName.K绌虹璐ф灦鍖篯.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)
.Where((l, c) => c.S_CNTR_CODE == model.CntId)
@@ -615,8 +632,7 @@
//}
var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.鍖呰鍖篯.Contains(l.S_AREA_CODE))
- .Where(l => taskInfo.EndAreas.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[AreaName.B鍖呰鍖篯.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();
@@ -676,87 +692,14 @@
}
}
- /// <summary>
- /// 鍒涘缓鎶芥鍗�- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- public static SimpleResult CreateCheckOrder(CreateCheckOrderInfo model) {
- var billName = "鎶芥鍗�;
- var db = new SqlHelper<object>().GetInstance();
- var info = "";
- try {
- var orderNo = GenerateOrderNo("鎶芥鍗曞彿", "CN");
-
- var order = new TN_Check_Order {
- S_NO = orderNo,
- S_ITEM_CODE = model.ItemCode,
- //S_ITEM_NAME = model.ItemName,
- S_BATCH_NO = model.BatchNo,
- N_COUNT = model.Qty,
- S_END_AREA = model.EndArea,
- };
-
- var cgDetailList = SelectCgByTotalQty(model);
- if (cgDetailList.Count == 0) {
- return NewSimpleResult(3, "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ユ娊妫�);
- }
-
- var detailList = new List<TN_Check_Detail>();
- foreach (var cgDetail in cgDetailList) {
- var detail = new TN_Check_Detail {
- S_NO = orderNo,
- S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- S_BATCH_NO = cgDetail.S_BATCH_NO,
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- S_END_AREA = model.EndArea,
- };
-
- detailList.Add(detail);
-
- cgDetail.N_ITEM_STATE = 3;
- cgDetail.S_ITEM_STATE = "鎶介獙涓�;
- }
-
- using (var tran = db.Ado.UseTran()) {
- if (db.Insertable<TN_Check_Order>(order).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚{billName}澶辫触锛� + JsonConvert.SerializeObject(order);
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
- }
-
- if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚{billName}鏄庣粏澶辫触";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
- }
-
- if (db.Updateable<TN_CG_Detail>(cgDetailList).UpdateColumns(it => new {
- it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鏇存柊鐗╂枡鐘舵�澶辫触";
-
- }
-
- tran.CommitTran();
- }
- return NewSimpleResult(0, $"鍒涘缓 鎶芥鍗�鎴愬姛");
- }
- catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
- }
- }
+
/// <summary>
/// 鎶芥-鍚堟牸鍥炲簱(PDA)
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult QualifiedBack(QualifiedBackInfo model) {
- var taskName = TaskName.鎶芥_鍚堟牸鍥炲簱;
+ var taskName = TaskName.C鎶芥_鍚堟牸鍥炲簱;
var db = new SqlHelper<object>().GetInstance();
var info = "";
try {
@@ -782,6 +725,7 @@
.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[AreaName.C鎶芥鍖篯.Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
@@ -793,14 +737,14 @@
var endLoc = new TN_Location();
if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.婊℃墭瀛樻斁鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[AreaName.M婊℃墭璐ф灦鍖篯.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 == "濂借繍绠�) {
endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.婊＄瀛樻斁鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[AreaName.M婊＄璐ф灦鍖篯.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();
@@ -876,16 +820,23 @@
}
}
public static SimpleResult UnqualifiedShift(UnqualifiedShiftInfo model) {
- var taskName = TaskName.鎶芥_涓嶅悎鏍肩Щ搴�
+ var taskName = TaskName.C鎶芥_涓嶅悎鏍肩Щ搴�
var db = new SqlHelper<object>().GetInstance();
var info = "";
try {
+
+ if (!Settings.AreaMap[AreaName.C鎶芥寮傚父鍖篯.Contains(model.EndArea)) {
+ info = $"缁堢偣搴撳尯{model.EndArea}涓嶅睘浜巤AreaName.C鎶芥寮傚父鍖簘";
+ LogHelper.Info(info);
+ return NewSimpleResult(1, info);
+ }
var cgDetail = db.Queryable<TN_CG_Detail>()
.Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_CNTR_CODE == model.CntrCode)
.First();
if (cgDetail == null) {
+
return NewSimpleResult(2, "娌℃湁鎵惧埌寰呭洖搴撶殑鎶芥鐗╂枡");
}
@@ -903,6 +854,7 @@
.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[AreaName.C鎶芥鍖篯.Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
@@ -984,7 +936,7 @@
}
public static SimpleResult RestBack(RestBackInfo model) {
- var taskName = TaskName.灏剧鍥炲簱;
+ var taskName = TaskName.W灏剧鍥炲簱;
var db = new SqlHelper<object>().GetInstance();
var info = "";
try {
@@ -1005,14 +957,14 @@
var endLoc = new TN_Location();
if (locCntrRel.S_CNTR_TYPE == "鎵樼洏") {
endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.婊℃墭瀛樻斁鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[AreaName.M婊℃墭璐ф灦鍖篯.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 =="濂借繍绠�){
endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.婊＄瀛樻斁鍖篯.Contains(l.S_AREA_CODE))
+ .Where(l => Settings.AreaMap[AreaName.M婊＄璐ф灦鍖篯.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();
@@ -1079,56 +1031,6 @@
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
return NewSimpleResult(1, info);
- }
- }
-
- public static List<TN_CG_Detail> SelectCgByTotalQty(CreateCheckOrderInfo model) {
- var db = new SqlHelper<object>().GetInstance();
- var result = new List<TN_CG_Detail>();
- var targetNum = model.Qty;
-
- try {
- var targetCg = db.Queryable<TN_CG_Detail>().Where(a => a.S_ITEM_CODE == model.ItemCode
- && a.N_ITEM_NUM > targetNum).
- OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc).First();
- if (targetCg != null) //鍒氬ソ鏈変竴琛屾弧瓒虫潯浠�- {
- result.Add(targetCg);
- return result;
- }
-
- var sortedMaterials = new List<TN_CG_Detail>();
-
- sortedMaterials = db.Queryable<TN_CG_Detail, TN_Loc_Container>((d, c) => d.S_CNTR_CODE == c.S_CNTR_CODE)
- .Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_BATCH_NO == model.BatchNo && d.N_ITEM_NUM > 0)
- .Where((d, c) => c.S_CNTR_TYPE == model.CntrType)
- .Where(d => d.N_ITEM_STATE == 1 && d.S_ITEM_STATE == "寰呮")
- .OrderBy(d => d.N_ITEM_NUM, OrderByType.Desc)
- .OrderBy(d => d.N_ITEM_STATE, OrderByType.Asc).ToList();
-
- if (sortedMaterials.Count == 0) //娌℃湁婊¤冻鏉′欢鐨�- {
- return result;
- }
-
- int countNum = 0;
- foreach (var mat in sortedMaterials) {
- countNum += mat.N_ITEM_NUM;
- result.Add(mat);
- if (countNum >= targetNum) {
- break;
- }
- }
- if (result.Sum(a => a.N_ITEM_NUM) >= targetNum) {
- return result;
- }
- else {
- result.Clear();
- return result;
- }
- }
- catch (Exception ex) {
- throw ex;
}
}
@@ -1336,106 +1238,10 @@
}
}
- /// <summary>
- /// 绉诲簱-鍒涘缓绉诲簱浠诲姟(WMS)
- /// </summary>
- /// <param name="model"></param>
- /// <returns></returns>
- public static SimpleResult CreateShiftOrder(CreateShiftOrderInfo model) {
- var billName = "鎶芥鍗�;
- var db = new SqlHelper<object>().GetInstance();
- var info = "";
- try {
- var orderNo = GenerateOrderNo("鎶芥鍗曞彿", "CN");
-
- var order = new TN_Check_Order {
- S_NO = orderNo,
- S_ITEM_CODE = model.ItemCode,
- //S_ITEM_NAME = model.ItemName,
- S_BATCH_NO = model.BatchNo,
- //N_COUNT = model.Qty,
- S_END_AREA = model.EndArea,
- };
-
- var cgDetailList = SelectShiftItem(model);
- if (cgDetailList.Count == 0) {
- return NewSimpleResult(3, "娌℃湁绗﹀悎瑕佹眰鐨勭墿鏂欓渶瑕佺Щ搴�);
- }
-
- var detailList = new List<TN_Check_Detail>();
- foreach (var cgDetail in cgDetailList) {
- var detail = new TN_Check_Detail {
- S_NO = orderNo,
- S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- S_BATCH_NO = cgDetail.S_BATCH_NO,
- S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- S_END_AREA = model.EndArea,
- };
-
- detailList.Add(detail);
-
- cgDetail.N_ITEM_STATE = 3;
- cgDetail.S_ITEM_STATE = "鎶介獙涓�;
- }
-
- using (var tran = db.Ado.UseTran()) {
- if (db.Insertable<TN_Check_Order>(order).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚{billName}澶辫触锛� + JsonConvert.SerializeObject(order);
- LogHelper.Info(info);
- return NewSimpleResult(2, info);
- }
-
- if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鐢熸垚{billName}鏄庣粏澶辫触";
- LogHelper.Info(info);
- return NewSimpleResult(4, info);
- }
-
- if (db.Updateable<TN_CG_Detail>(cgDetailList).UpdateColumns(it => new {
- it.N_ITEM_STATE, it.S_ITEM_STATE }).ExecuteCommand() <= 0) {
- tran.RollbackTran();
- info = $"鏇存柊鐗╂枡鐘舵�澶辫触";
-
- }
-
- tran.CommitTran();
- }
- return NewSimpleResult(0, $"鍒涘缓 鎶芥鍗�鎴愬姛");
- }
- catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return NewSimpleResult(1, info);
- }
- }
-
- public static List<TN_CG_Detail> SelectShiftItem(CreateShiftOrderInfo model) {
- var db = new SqlHelper<object>().GetInstance();
- var result = new List<TN_CG_Detail>();
- var info = "";
- try {
- var targetItemList = db.Queryable<TN_CG_Detail>()
- .Where(a => a.S_ITEM_CODE == model.ItemCode)
- .Where(a => a.S_BATCH_NO == model.BatchNo)
- .Where(a => a.N_ITEM_STATE != 3 && a.S_ITEM_CODE != "鎶芥涓�)
- .OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc)
- .ToList();
-
- return targetItemList;
- }
- catch (Exception ex) {
- info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- LogHelper.InfoEx(ex);
- return result;
- }
- }
-
private static string GenerateOrderNo(string snType, string prefix) {
var id = SYSHelper.GetSerialNumber(snType, prefix);
var date = DateTime.Now.ToString("yyMMdd");
- return $"ON{date}{id.ToString().PadLeft(4, '0')}";
+ return $"{prefix}{date}{id.ToString().PadLeft(4, '0')}";
}
/// <summary>
@@ -1443,7 +1249,7 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- public static WmsResult CgInfoSync(CgInfoSyncInfo model) {
+ public static MesResult CgInfoSync(CgInfoSyncInfo model) {
var db = new SqlHelper<object>().GetInstance();
var random = new Random();
var info = "";
@@ -1470,7 +1276,7 @@
if (db.Insertable<TN_CG_Detail>(detail).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = "鎻掑叆鐗╂枡淇℃伅澶辫触锛� + JsonConvert.SerializeObject(detail);
- return NewWmsResult(2, info);
+ return NewMesResult(2, info);
}
//if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() <= 0) {
@@ -1483,12 +1289,26 @@
}
info = "鎻掑叆鐗╂枡淇℃伅鎴愬姛";
- return NewWmsResult(0, info);
+ return NewMesResult(0, info);
}
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
LogHelper.InfoEx(ex);
- return NewWmsResult(1, info);
+ return NewMesResult(1, info);
+ }
+ }
+
+ public static ErpResult ErpSendOutboundOrder(ErpSendOutboundOrderInfo model) {
+ var db = new SqlHelper<object>().GetInstance();
+ var info = "";
+ try {
+ // TODO
+ return NewErpResult(0, info);
+ }
+ catch (Exception ex) {
+ info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
+ LogHelper.InfoEx(ex);
+ return NewErpResult(1, info);
}
}
}
--
Gitblit v1.9.1