From e2303b1125817cb7887e36d5905c8f1661d685a3 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期四, 29 五月 2025 17:29:52 +0800
Subject: [PATCH] 完善ERP出库下发任务及来源单号、记录表的字段更新
---
Models/TN_Outbound_Order.cs | 4
core/Monitor.cs | 10
api/ErpController.cs | 2
/dev/null | 23 -
Models/TN_Task.cs | 3
models/TN_Container_ItemType.cs | 23 +
api/ApiModel.cs | 104 +++---
core/WCSCore.cs | 70 ++++
HH.WCS.Mobox3.DSZSH.csproj | 2
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/fb5893ae-54ab-4004-9fc4-c8a740b25317.vsidx | 0
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/0e784c8d-2ea0-45e5-8726-82d212591fce.vsidx | 0
wms/WCSHelper.cs | 21 +
api/DebugController.cs | 178 +++++++++++
util/Settings.cs | 4
models/TN_Record_Table.cs | 38 -
api/ApiHelper.cs | 375 +++++++++---------------
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e95c9dfb-066e-4e8f-a68a-626ca63d579a.vsidx | 0
Models/TN_CG_Detail.cs | 8
api/MoboxController.cs | 2
.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/541e9f47-0b5c-4a4e-9982-872d7ed880d7.vsidx | 0
20 files changed, 504 insertions(+), 363 deletions(-)
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/0e784c8d-2ea0-45e5-8726-82d212591fce.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/0e784c8d-2ea0-45e5-8726-82d212591fce.vsidx
new file mode 100644
index 0000000..6353d41
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/0e784c8d-2ea0-45e5-8726-82d212591fce.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/541e9f47-0b5c-4a4e-9982-872d7ed880d7.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/541e9f47-0b5c-4a4e-9982-872d7ed880d7.vsidx
new file mode 100644
index 0000000..d1602e8
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/541e9f47-0b5c-4a4e-9982-872d7ed880d7.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/71a55ff9-7db4-4aa9-9789-25ab0233a3db.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/71a55ff9-7db4-4aa9-9789-25ab0233a3db.vsidx
deleted file mode 100644
index f836484..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/71a55ff9-7db4-4aa9-9789-25ab0233a3db.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/b024e27a-9190-40bd-b5fa-a582e167513a.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/b024e27a-9190-40bd-b5fa-a582e167513a.vsidx
deleted file mode 100644
index 829ce45..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/b024e27a-9190-40bd-b5fa-a582e167513a.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/cb0eed0a-5128-4296-811d-7549d46790a5.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/cb0eed0a-5128-4296-811d-7549d46790a5.vsidx
deleted file mode 100644
index cbfe6c5..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/cb0eed0a-5128-4296-811d-7549d46790a5.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e95c9dfb-066e-4e8f-a68a-626ca63d579a.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e95c9dfb-066e-4e8f-a68a-626ca63d579a.vsidx
new file mode 100644
index 0000000..557714e
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/e95c9dfb-066e-4e8f-a68a-626ca63d579a.vsidx
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/f744ef35-4f64-4a61-abee-af81aa222790.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/f744ef35-4f64-4a61-abee-af81aa222790.vsidx
deleted file mode 100644
index ee879dc..0000000
--- a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/f744ef35-4f64-4a61-abee-af81aa222790.vsidx
+++ /dev/null
Binary files differ
diff --git a/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/fb5893ae-54ab-4004-9fc4-c8a740b25317.vsidx b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/fb5893ae-54ab-4004-9fc4-c8a740b25317.vsidx
new file mode 100644
index 0000000..1681a73
--- /dev/null
+++ b/.vs/HH.WCS.Mobox3.DSZSH/FileContentIndex/fb5893ae-54ab-4004-9fc4-c8a740b25317.vsidx
Binary files differ
diff --git a/HH.WCS.Mobox3.DSZSH.csproj b/HH.WCS.Mobox3.DSZSH.csproj
index 93a7892..12ce7fb 100644
--- a/HH.WCS.Mobox3.DSZSH.csproj
+++ b/HH.WCS.Mobox3.DSZSH.csproj
@@ -244,7 +244,7 @@
<Compile Include="models\TN_Spot_Check.cs" />
<Compile Include="process\TaskProcess.cs" />
<Compile Include="util\SqlHelper.cs" />
- <Compile Include="models\TN_Container_Item.cs" />
+ <Compile Include="models\TN_Container_ItemType.cs" />
<Compile Include="models\TN_Outbound_Order.cs" />
<Compile Include="models\TN_Outbound_Detail.cs" />
<Compile Include="device\ProductionLineDevice.cs" />
diff --git a/Models/TN_CG_Detail.cs b/Models/TN_CG_Detail.cs
index 84c29ea..18feb05 100644
--- a/Models/TN_CG_Detail.cs
+++ b/Models/TN_CG_Detail.cs
@@ -10,12 +10,12 @@
/// <summary>
/// 鏂欑鍟嗗搧鏍囪瘑
/// </summary>
- public string S_CG_ID { get; set; } = string.Empty; // 鏆傛椂鐢ㄤ笉鍒帮紝榛樿涓虹┖
+ public string S_CG_ID { get; set; } = string.Empty;
/// <summary>
/// 鐗╂枡缂栫爜
/// </summary>
- public string S_ITEM_CODE { get; set; }
+ public string S_ITEM_CODE { get; set; } = string.Empty;
/// <summary>
/// 鐗╂枡鍚嶇О
@@ -25,7 +25,7 @@
/// <summary>
/// 瀹瑰櫒缂栫爜
/// </summary>
- public string S_CNTR_CODE { get; set; }
+ public string S_CNTR_CODE { get; set; } = string.Empty;
/// <summary>
/// 璐у搧鐘舵�锛�鍚堟牸 1寰呮 2涓嶅悎鏍�3鎶芥涓紱涓嬬嚎鍗冲緟妫�@@ -40,7 +40,7 @@
/// <summary>
/// 鎵规鍙� /// </summary>
- public string S_BATCH_NO { get; set; }
+ public string S_BATCH_NO { get; set; } = string.Empty;
/// <summary>
/// 璐у搧鏁伴噺
diff --git a/Models/TN_Container_Item.cs b/Models/TN_Container_Item.cs
deleted file mode 100644
index 5b03144..0000000
--- a/Models/TN_Container_Item.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using SqlSugar;
-
-namespace HH.WCS.Mobox3.DSZSH.models {
- /// <summary>
- /// 瀹瑰櫒-鐗╂枡绫诲瀷 鍏崇郴琛紙鍙敤浜庢墭鐩橈級
- /// </summary>
- /// <remarks>
- /// 鐩墠鐞嗚В涓猴細绗竴娆℃弧鎵樹笅鏂欑殑鏃跺�锛屽皢缁戝畾鍏崇郴璁板綍鍦ㄨ繖涓〃涓紝鐒跺悗涓嶅啀鍒犻櫎<br/>
- /// 鍚庨潰绌烘墭鍙墭鐩樼殑鏃跺�锛岃仈琛ㄦ煡鐗╂枡缂栧彿<br/>
- /// 鍚庣画鍙兘鏄彁鍓嶇淮鎶わ紝灏嗗鍣ㄥ拰鐗╂枡缂栫爜鍐欏叆杩欎釜琛紝鎴栬�鐩存帴璁╃被鍨嬪湪瀹瑰櫒缂栫爜涓綋鐜�- /// </remarks>
- [SugarTable("TN_Container_Item")]
- public class TN_Container_Item : BaseModel {
- public string S_CNTR_CODE { get; set; }
- public string S_ITEM_CODE { get; set; }
- }
-}
diff --git a/Models/TN_Outbound_Order.cs b/Models/TN_Outbound_Order.cs
index 175fd0d..e40fb0e 100644
--- a/Models/TN_Outbound_Order.cs
+++ b/Models/TN_Outbound_Order.cs
@@ -13,6 +13,10 @@
/// </summary>
public string S_NO { get; set; }
+ public string S_BS_TYPE { get; set; } = string.Empty; // ERP
+
+ public string S_BS_NO { get; set; } = string.Empty; // ERP 鍗曞彿锛堟潵婧愬崟鍙凤級
+
/// <summary>
/// 涓氬姟鐘舵�锛�寰呮墽琛�1宸蹭笅鍙�2鎵ц涓�3宸插畬鎴� /// </summary>
diff --git a/Models/TN_Task.cs b/Models/TN_Task.cs
index 7f2ed19..5e7656d 100644
--- a/Models/TN_Task.cs
+++ b/Models/TN_Task.cs
@@ -84,6 +84,9 @@
public int N_END_LAYER { get; internal set; }
public int N_CNTR_COUNT { get; internal set; }
+ public string S_BS_NO { get; set; } = string.Empty;
+ public string S_BS_TYPE { get; set; } = string.Empty;
+
///// <summary>
///// 鏄惁寮哄埗鍑哄簱锛�涓嶅己鍒�1寮哄埗
///// </summary>
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index beda0c6..fc8de9c 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -19,29 +19,33 @@
using static HH.WCS.Mobox3.DSZSH.api.OtherModel;
using static HH.WCS.Mobox3.DSZSH.Config;
-
namespace HH.WCS.Mobox3.DSZSH.api {
public class ApiHelper {
/// <summary>
- /// 濂借繍绠�婊℃墭涓嬬嚎鍏ュ簱(PDA)
+ /// 濂借繍绠�婊＄涓嬬嚎鍏ュ簱(PDA)
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
- var taskName = TaskName.H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱; // 鐢ㄤ簬鐢熸垚浠诲姟绫诲瀷銆佹墦鍗版棩蹇椾俊鎭� var db = new SqlHelper<object>().GetInstance();
var info = "";
+
+ var taskName = TaskName.H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱; // 鐢ㄤ簬鐢熸垚浠诲姟绫诲瀷銆佹墦鍗版棩蹇椾俊鎭�+ var startAreaName = AreaName.M婊＄鎿嶄綔鍖�
+ var endAreaName = AreaName.M婊＄璐ф灦鍖�
+
try {
// 灏哖DA鎻愪緵鐨勭墿鏂欑紪鐮佷笌璐存爣鏈虹殑淇℃伅姣斿
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 == "寰呮") // 鏂板鐗╂枡锛屾晠鐗╂枡鐘舵�搴旇涓�1寰呮
+ // TODO model 涓�鏁伴噺銆佽鏍兼槸鍚︿篃鍙備笌姣斿 寰呭悗缁姹� .First();
if (cgDetail == null) {
info = $"PDA鎵爜鐗╂枡淇℃伅涓庤创鏍囨満浼犻�鐨勪俊鎭笉涓�嚧锛� + JsonConvert.SerializeObject(model);
LogHelper.Info(info);
- return NewSimpleResult(1, info);
+ return NewSimpleResult(2, info);
}
// 璧风偣璐т綅缁戝畾鍚庯紝鍙互涓嶇珛鍗宠缃甆_CURRENT_NUM涓�
@@ -50,11 +54,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))
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
- info = $"鍦�{AreaName.M婊＄鎿嶄綔鍖簘'涓病鏈夋壘鍒拌捣鐐硅揣浣�{model.StartLoc}'锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒拌捣鐐硅揣浣峽model.StartLoc}锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�缁戝畾鍓嶆棤璐х墿";
LogHelper.Info(info);
return NewSimpleResult(3, info);
}
@@ -68,14 +72,14 @@
// TODO 婊＄鍏ュ簱绠楁硶寰呬紭鍖� var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.M婊＄璐ф灦鍖篯.Contains(l.S_AREA_CODE)) // 缁堢偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .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)
+ .OrderBy(l => l.N_LAYER) // 鎸夎揣鏋舵渶浣庢帓搴� .First();
if (endLoc == null) {
- info = "婊＄鍏ュ簱鏆傛椂娌℃湁鍚堥�鐨勮揣浣嶅彲浠ュ叆搴�;
+ info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�;
LogHelper.Info(info);
return NewSimpleResult(4, info);
}
@@ -86,27 +90,12 @@
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) {
info = $"鎻掑叆璐т綅瀹瑰櫒鍏崇郴澶辫触锛� + JsonConvert.SerializeObject(locCntrRel);
tran.RollbackTran();
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(5, info);
}
if (db.Updateable<TN_Location>(startLoc).UpdateColumns(it => new {
@@ -118,7 +107,7 @@
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂拌捣鐐硅揣浣峽startLoc.S_CODE}閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(5, info);
}
if (db.Updateable<TN_Location>(endLoc).UpdateColumns(it => new {
@@ -130,14 +119,14 @@
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛氭洿鏂扮粓鐐硅揣浣峽endLoc.S_CODE}閿佺姸鎬佸け璐�;
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(5, info);
}
if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐢熸垚浠诲姟'{taskName}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣鏋秢endLoc.S_CODE}";
LogHelper.Info(info);
- return NewSimpleResult(4, info);
+ return NewSimpleResult(5, info);
}
tran.CommitTran();
@@ -153,122 +142,26 @@
}
}
- ///// <summary>
- ///// 绌烘墭鐩樼粦瀹�PDA)
- ///// </summary>
- ///// <param name="model"></param>
- ///// <returns></returns>
- //public static SimpleResult EmptyBindPallet(EmptyBindInfo model) {
- // var db = DbHelper.GetDbClient();
-
- // try {
- // var loc = db.Queryable<TN_Location>()
- // .Where(ExprHelper.LocCode(model.LocCode))
- // .Where(ExprHelper.LocBelongsToArea(AreaName.绌烘墭鐩樻帴椹冲尯))
- // .Where(ExprHelper.LocIsFree)
- // .Where(ExprHelper.LocIsEmpty).First();
-
- // if (loc == null) {
- // return BuildSimpleResult(2, $"褰撳墠璐т綅 '{model.LocCode}' 鏃犳硶鍐嶇粦瀹氬鍣�);
- // }
-
- // var locCntrRel = db.Queryable<TN_Loc_Container>()
- // .Where(lc => lc.S_CNTR_CODE == model.LocCode).First();
-
- // if (locCntrRel != null) {
- // return BuildSimpleResult(3, $"褰撳墠瀹瑰櫒 '{model.CntrCode}' 宸茬粡涓�'{locCntrRel.S_LOC_CODE}' 缁戝畾");
- // }
-
- // //loc.N_CURRENT_NUM = model.PalletCount;
-
- // locCntrRel = new TN_Loc_Container {
- // S_LOC_CODE = model.LocCode,
- // S_CNTR_CODE = model.CntrCode
- // };
-
- // using (var tran = db.Ado.UseTran()) {
- // if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() > 0
- // && db.Updateable<TN_Location>(loc).UpdateColumns(it => it.N_CURRENT_NUM).ExecuteCommand() > 0) {
- // tran.CommitTran();
- // return BuildSimpleResult(0, $"缁戝畾瀹瑰櫒 '{model.CntrCode}' 涓庤揣浣�'{model.LocCode}' 鎴愬姛");
- // }
- // else {
- // tran.RollbackTran();
- // return BuildSimpleResult(4, $"缁戝畾瀹瑰櫒 '{model.CntrCode}' 涓庤揣浣�'{model.LocCode}' 澶辫触");
- // }
- // }
- // }
- // catch (Exception ex) {
- // return BuildSimpleEx(ex);
- // }
- //}
-
- ///// <summary>
- ///// 绌虹缁戝畾(PDA)
- ///// </summary>
- ///// <param name="model"></param>
- ///// <returns></returns>
- //public static SimpleResult EmptyBindGoodpack(EmptyBindInfo model) {
- // var db = DbHelper.GetDbClient();
-
- // try {
- // var loc = db.Queryable<TN_Location>()
- // .Where(ExprHelper.LocCode(model.LocCode))
- // .Where(ExprHelper.LocBelongsToArea(AreaName.绌虹鎺ラ┏鍖�)
- // .Where(ExprHelper.LocIsFree)
- // .Where(ExprHelper.LocIsEmpty).First();
-
- // if (loc == null) {
- // return BuildSimpleResult(2, $"褰撳墠璐т綅 '{model.LocCode}' 鏃犳硶鍐嶇粦瀹氬鍣�);
- // }
-
- // var locCntrRel = db.Queryable<TN_Loc_Container>()
- // .Where(lc => lc.S_CNTR_CODE == model.LocCode).First();
-
- // if (locCntrRel != null) {
- // return BuildSimpleResult(3, $"褰撳墠瀹瑰櫒 '{model.CntrCode}' 宸茬粡涓�'{locCntrRel.S_LOC_CODE}' 缁戝畾");
- // }
-
- // loc.N_CURRENT_NUM = 1; // 绌虹缁戝畾鏃跺鍣ㄦ暟蹇呯劧涓�1
-
- // locCntrRel = new TN_Loc_Container {
- // S_LOC_CODE = model.LocCode,
- // S_CNTR_CODE = model.CntrCode
- // };
-
- // using (var tran = db.Ado.UseTran()) {
- // if (db.Insertable<TN_Loc_Container>(locCntrRel).ExecuteCommand() > 0
- // && db.Updateable<TN_Location>(loc).UpdateColumns(it => it.N_CURRENT_NUM).ExecuteCommand() > 0) {
- // tran.CommitTran();
- // return BuildSimpleResult(0, $"缁戝畾瀹瑰櫒 '{model.CntrCode}' 涓庤揣浣�'{model.LocCode}' 鎴愬姛");
- // }
- // else {
- // tran.RollbackTran();
- // return BuildSimpleResult(4, $"缁戝畾瀹瑰櫒 '{model.CntrCode}' 涓庤揣浣�'{model.LocCode}' 澶辫触");
- // }
- // }
- // }
- // catch (Exception ex) {
- // return BuildSimpleEx(ex);
- // }
- //}
-
/// <summary>
/// 鎵樼洏-绌烘墭鍏ュ簱(PDA)
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult EmptyInboundPallet(EmptyInboundInfo model) {
- var taskName = TaskName.T鎵樼洏_绌烘墭鍏ュ簱;
var db = new SqlHelper<object>().GetInstance();
var info = "";
+
+ var taskName = TaskName.T鎵樼洏_绌烘墭鍏ュ簱;
+ var startAreaName = AreaName.K绌烘墭鍏ュ簱鎺ラ┏鍖�
+ var endAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+
try {
// 鐜板湪PDA娌℃湁鍗曠嫭鐨勭粦瀹氭祦绋嬶紝缁戝畾鍦ㄥ叆搴撴椂瀹屾垚
var startLoc = db.Queryable<TN_Location>()
.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)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
@@ -276,17 +169,6 @@
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
-
- // 鏌ョ湅瀹瑰櫒涓庤捣鐐硅揣浣嶆槸鍚︾粦瀹�- //var locCntrRel = db.Queryable<TN_Loc_Container>()
- // .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
- // .First();
-
- //if (locCntrRel == null) {
- // info = $"璧风偣浣嶇疆{model.StartLoc}娌℃湁缁戝畾瀹瑰櫒{model.CntrCode}";
- // LogHelper.Info(info);
- // return NewSimpleResult(3, info);
- //}
// 缁戝畾璐т綅鍜屽鍣ㄥ彿
var locCntrRel = new TN_Loc_Container {
@@ -297,14 +179,14 @@
// TODO 鏆傚畾閫夋嫨鏈�綆灞傛寜鍖轰綅椤哄簭鍏ュ簱锛屽悗闈㈠緟淇敼
var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.K绌烘墭瀛樻斁鍖篯.Contains(l.S_AREA_CODE)) // 缁堢偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .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 => new { l.N_LAYER, row=SqlFunc.Desc(l.S_AREA_CODE) })
+ .OrderBy(l => new { l.N_LAYER, l.N_ROW, l.N_COL })
.First();
if (endLoc == null) {
- info = $"鏆傛椂娌℃湁绗﹀悎鏉′欢鐨勭粓鐐规斁璐т綅";
+ info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�;
LogHelper.Info(info);
return NewSimpleResult(4, info);
}
@@ -372,15 +254,19 @@
/// </summary>
/// <returns></returns>
public static SimpleResult EmptyInboundGoodpack(EmptyInboundInfo model) {
- var taskName = TaskName.H濂借繍绠盻绌虹鍏ュ簱;
var db = new SqlHelper<object>().GetInstance();
var info = "";
+
+ var taskName = TaskName.H濂借繍绠盻绌虹鍏ュ簱;
+ var startAreaName = AreaName.K绌虹鍏ュ簱鎺ラ┏鍖�
+ var endAreaName = AreaName.K绌虹璐ф灦鍖�
+
try {
var startLoc = db.Queryable<TN_Location>()
.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)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
@@ -388,17 +274,6 @@
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
-
- // 鏌ョ湅瀹瑰櫒涓庤捣鐐硅揣浣嶆槸鍚︾粦瀹�- //var locCntrRel = db.Queryable<TN_Loc_Container>()
- // .Where(c => c.S_LOC_CODE == model.StartLoc && c.S_CNTR_CODE == model.CntrCode)
- // .First();
-
- //if (locCntrRel == null) {
- // info = $"璧风偣浣嶇疆{model.StartLoc}娌℃湁缁戝畾瀹瑰櫒{model.CntrCode}";
- // LogHelper.Info(info);
- // return NewSimpleResult(3, info);
- //}
// 缁戝畾璐т綅鍜屽鍣ㄥ彿
var locCntrRel = new TN_Loc_Container {
@@ -409,14 +284,16 @@
// TODO 鏆傚畾閫夋嫨鏈�綆灞傞『搴忓叆搴擄紝鍚庨潰寰呬慨鏀� var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.K绌虹璐ф灦鍖篯.Contains(l.S_AREA_CODE))
+ .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 => new { l.N_LAYER })
.First();
if (endLoc == null) {
- return NewSimpleResult(4, $"鏆傛椂娌℃湁绗﹀悎鏉′欢鐨勭粓鐐规斁璐т綅");
+ info = $"鍦�{endAreaName}'涓病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛岄渶瑕佹弧瓒筹細鏈笂閿併�鏃犺揣鐗�;
+ LogHelper.Info(info);
+ return NewSimpleResult(4, info);
}
var cntId = locCntrRel.S_CNTR_CODE;
@@ -483,51 +360,31 @@
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult EmptyOnlinePallet(EmptyOnlinePalletInfo model) {
- var taskName = TaskName.T鎵樼洏_绌烘墭涓婄嚎;
var db = new SqlHelper<object>().GetInstance();
var info = "";
+
+ var taskName = TaskName.T鎵樼洏_绌烘墭涓婄嚎;
+ var startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+
try {
- // 鎵剧鍚堢墿鏂欎俊鎭殑璐т綅
- //var startLoc = db.Queryable<TN_Location>()
- // .LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) // 鑱旇〃锛氳揣浣嶅鍣ㄥ叧绯昏〃
- // .LeftJoin<TN_Container_Item>((l, c, i) => c.S_CNTR_CODE == i.S_CNTR_CODE) // 鑱旇〃锛氬鍣ㄤ笌鐗╂枡绫诲瀷缁戝畾琛�- // .Where(l => taskInfo.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) // 绛涢�锛氭湁璐ц揣浣�- // .Where((l, c) => c.S_CNTR_CODE == model.CntId) // 鎵炬寚瀹氬鍣ㄥ彿
- // .Where((l, c, i) => i.S_ITEM_CODE == model.ItemCode) // 纭繚瀹瑰櫒缂栫爜缁戝畾鐨勭墿鏂欑紪鐮佷笌鎵�渶涓�嚧
- // .First();
-
- //if (startLoc == null) {
- // info = $"鍦ㄧ┖鎵樺瓨鏀惧尯涓紝鎵句笉鍒扮鍚坽model.ItemCode}鐗╂枡锛屼笖缂栫爜涓簕model.CntId}鐨勭┖鎵樼洏";
- // LogHelper.Info(info);
- // return NewSimpleResult(2, info);
- //}
-
- //var locCntrRel = db.Queryable<TN_Loc_Container>().First(
- // a => a.S_LOC_CODE == startLoc.S_CODE
- // && a.S_CNTR_CODE == model.CntId);
-
- //if (locCntrRel == null) {
- // return NewSimpleResult(3, $"璧风偣浣嶇疆 '{startLoc.S_CODE}' 娌℃湁缁戝畾瀹瑰櫒 '{model.CntId}'");
- //}
-
- var cntrItemRel = db.Queryable<TN_Container_Item>()
- .Where(i => i.S_CNTR_CODE == model.CntId && i.S_ITEM_CODE == model.ItemCode)
+ // 鏌ュ鍣�鐗╂枡绫诲瀷琛�+ var cntrItemRel = db.Queryable<TN_Container_ItemType>()
+ .Where(i => i.S_CNTR_CODE == model.CntId && i.S_CNTR_TYPE == "鎵樼洏")
.First();
-
- if (cntrItemRel == null) {
- info = $"瀹瑰櫒{model.CntId}涓嶇鍚堢墿鏂檣model.ItemCode}锛氭病鏈夊湪瀹瑰櫒鐗╂枡绫诲瀷鐧昏琛ㄤ腑鎵惧埌";
+ // 濡傛灉琛ㄤ腑瀛樺湪杩欎釜鎵樼洏淇℃伅锛屼笖鐗╂枡绫诲瀷涓庝笂绾挎墍闇�墿鏂欎笉绗︼紝鎶ラ敊
+ // 濡傛灉涓嶅瓨鍦紝涓嶄綔闄愬埗锛堣浣滅涓�涓婄嚎锛�+ if (cntrItemRel != null && cntrItemRel.S_ITEM_CODE != model.ItemCode) {
+ info = $"瀹瑰櫒{model.CntId}宸茬粡涓庣墿鏂欑被鍨媨cntrItemRel.S_ITEM_CODE}缁戝畾锛屾棤娉曠敤浜庤杞界墿鏂檣model.ItemCode}";
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
var startLoc = db.Queryable<TN_Location>()
.LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE) // 鑱旇〃锛氳揣浣嶅鍣ㄥ叧绯昏〃
- .Where(l => Settings.AreaMap[AreaName.K绌烘墭瀛樻斁鍖篯.Contains(l.S_AREA_CODE)) // 闄愬畾鍦ㄧ┖鎵樺瓨鏀惧尯涓壘瀹瑰櫒璐т綅
+ .Where((l, c) => c.S_CNTR_CODE == model.CntId) // 鎵炬寚瀹氬鍣ㄥ彿
+ .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 == 1) // 绛涢�锛氭湁璐ц揣浣�- .Where((l, c) => c.S_CNTR_CODE == model.CntId) // 鎵炬寚瀹氬鍣ㄥ彿
.First();
if (startLoc == null) {
@@ -605,40 +462,37 @@
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult EmptyOnlineGoodpack(EmptyOnlineGoodpackInfo model) {
- var taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎;
var db = new SqlHelper<object>().GetInstance();
var info = "";
+
+ var taskName = TaskName.H濂借繍绠盻绌虹涓婄嚎;
+ var startAreaName = AreaName.K绌烘墭瀛樻斁鍖�
+
try {
var startLoc = db.Queryable<TN_Location>()
.LeftJoin<TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
- .Where(l => Settings.AreaMap[AreaName.K绌虹璐ф灦鍖篯.Contains(l.S_AREA_CODE))
+ .Where((l, c) => c.S_CNTR_CODE == model.CntId)
+ .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 == 1)
- .Where((l, c) => c.S_CNTR_CODE == model.CntId)
.First();
if (startLoc == null) {
- info = $"鍦ㄧ┖绠卞瓨鏀惧尯涓紝鎵句笉鍒扮紪鐮佷负{model.CntId}鐨勭┖濂借繍绠�;
+ info = $"鍦�{startAreaName}'涓紝鎵句笉鍒扮紪鐮佷负{model.CntId}鐨勭┖濂借繍绠�;
LogHelper.Info(info);
return NewSimpleResult(2, info);
}
- //var locCntrRel = db.Queryable<TN_Loc_Container>().First(
- // a => a.S_LOC_CODE == startLoc.S_CODE
- // && a.S_CNTR_CODE == model.CntId);
-
- //if (locCntrRel == null) {
- // return NewSimpleResult(3, $"璧风偣浣嶇疆 '{startLoc.S_CODE}' 娌℃湁缁戝畾瀹瑰櫒 '{model.CntId}'");
- //}
-
var endLoc = db.Queryable<TN_Location>()
- .Where(l => Settings.AreaMap[AreaName.B鍖呰鍖篯.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();
if (endLoc == null) {
- return NewSimpleResult(4, $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�);
+ info = $"缁堢偣浣嶇疆 涓嶅瓨鍦ㄦ垨涓嶅叿澶囨斁璐ц姹�;
+ LogHelper.Info(info);
+ return NewSimpleResult(4, info);
}
var cntId = model.CntId;
@@ -699,9 +553,12 @@
/// <param name="model"></param>
/// <returns></returns>
public static SimpleResult QualifiedBack(QualifiedBackInfo model) {
- var taskName = TaskName.C鎶芥_鍚堟牸鍥炲簱;
var db = new SqlHelper<object>().GetInstance();
var info = "";
+
+ var taskName = TaskName.C鎶芥_鍚堟牸鍥炲簱;
+ var startAreaName = AreaName.C鎶芥鍖�
+
try {
var cgDetail = db.Queryable<TN_CG_Detail>()
.Where(d => d.S_ITEM_CODE == model.ItemCode && d.S_CNTR_CODE == model.CntrCode)
@@ -715,21 +572,15 @@
.Where(c => c.S_CNTR_CODE == cgDetail.S_CNTR_CODE)
.First();
- //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 == cgDetail.S_CNTR_CODE) // 鎸囧畾瀹瑰櫒鍙�- // .Where(a => a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃� && a.C_ENABLE == "Y") // 绛涢�锛氭湭涓婇攣
- // .First();
-
var startLoc = db.Queryable<TN_Location>()
.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)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
+ .Where(l => Settings.AreaMap[startAreaName].Contains(l.S_AREA_CODE)) // 璧风偣璐у尯绗﹀悎浠诲姟瑕佹眰
.First();
if (startLoc == null) {
- info = "娌℃湁鎵惧埌鍚堥�鐨勮捣鐐硅揣浣�;
+ info = $"鍦�{startAreaName}'涓病鏈夋壘鍒板鍣▄model.CntrCode}鐨勮捣鐐硅揣浣嶏紝鎴栦笉鍏峰鍙栬揣瑕佹眰锛氭湭涓婇攣銆佹湁璐х墿";
LogHelper.Info(info);
return NewSimpleResult(0, info);
}
@@ -753,9 +604,10 @@
return NewSimpleResult(2, $"鎵樼洏绫诲瀷{locCntrRel.S_CNTR_TYPE}涓嶅悎娉曪細鎵樼洏鍙穥locCntrRel.S_CNTR_CODE}");
}
-
if (endLoc == null) {
- return NewSimpleResult(3, "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅");
+ info = "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
}
cgDetail.N_ITEM_STATE = 0;
@@ -951,7 +803,9 @@
.First();
if (locCntrRel == null) {
- return NewSimpleResult(2, $"璧风偣璐т綅 {model.StartLoc}");
+ info = $"娌℃湁鎵惧埌璧风偣璐т綅{model.StartLoc}锛屾垨涓嶅叿澶囧彇璐ц姹傦細鏈笂閿併�鏈夎揣鐗�;
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
}
var endLoc = new TN_Location();
@@ -973,14 +827,10 @@
endLoc = null;
}
- //var endLoc = db.Queryable<TN_Location, TN_Loc_Container>((l, c) => l.S_CODE == c.S_LOC_CODE)
- // .Where((l, c) => c.S_CNTR_TYPE == locCntrRel.S_CNTR_TYPE)
- // .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) {
- return NewSimpleResult(3, $"涓嶅瓨鍦ㄥ悎閫傜殑缁堢偣璐т綅鍙互鍥炲簱");
+ info = "鏌ヨ锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅";
+ LogHelper.Info(info);
+ return NewSimpleResult(3, info);
}
var cntId = locCntrRel.S_CNTR_CODE;
var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
@@ -1178,9 +1028,10 @@
var targetNum = model.Qty;
var info = "";
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();
+ var targetCg = db.Queryable<TN_CG_Detail>()
+ .Where(a => a.S_ITEM_CODE == model.ItemCode && a.S_BATCH_NO == model.BatchNo)
+ .Where(a => a.N_ITEM_NUM > targetNum)
+ .OrderBy(a => a.N_ITEM_NUM, OrderByType.Asc).First();
if (targetCg != null) //鍒氬ソ鏈変竴琛屾弧瓒虫潯浠� {
result.Add(targetCg);
@@ -1300,10 +1151,74 @@
public static ErpResult ErpSendOutboundOrder(ErpSendOutboundOrderInfo model) {
var db = new SqlHelper<object>().GetInstance();
+ var orderNo = GenerateOrderNo("鍑哄簱鍗曞彿", "ON");
var info = "";
try {
- // TODO
- return NewErpResult(0, info);
+ if (string.IsNullOrEmpty(orderNo)) {
+ info = "鍑哄簱鍗曞彿涓嶈兘涓虹┖";
+ LogHelper.Info(info);
+ return NewErpResult(2, info);
+ }
+
+ var cgDetailList = SelectCgByTotalQty(new FinishedOutboundInfo {
+ BatchNo = model.BatchNo,
+ CntrType= model.CntrType,
+ ItemCode= model.ItemCode,
+ EndArea= model.EndArea,
+ ForcedOut= model.ForcedOut,
+ Qty= model.Qty,
+ Spe = model.Spe
+ });
+
+ if (cgDetailList.Count == 0) {
+ info = "娌℃湁鍚堥�鐨勭墿鏂欏彲浠ュ嚭搴�;
+ LogHelper.Info(info);
+ return NewErpResult(3, info);
+ }
+
+ var order = new TN_Outbound_Order {
+ S_NO = orderNo,
+ S_ITEM_CODE = model.ItemCode,
+ S_BATCH = model.BatchNo,
+ N_END_NUM = model.Qty,
+ //F_OUT_QTY = cgDetailList.Sum(a => a.N_QTY),
+ S_END_AREA = model.EndArea,
+ S_BS_NO = model.ErpNo,
+ 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 = model.EndArea
+ };
+ detailList.Add(detail);
+ }
+
+ using (var tran = db.Ado.UseTran()) {
+ if (db.Insertable<TN_Outbound_Order>(order).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = "鐢熸垚鍑哄簱鍗曞け璐ワ細" + JsonConvert.SerializeObject(order);
+ LogHelper.Info(info);
+ return NewErpResult(2, info);
+ }
+
+ if (db.Insertable<TN_Outbound_Detail>(detailList).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ info = "鐢熸垚鍑哄簱鍗曟槑缁嗗け璐�;
+ LogHelper.Info(info);
+ return NewErpResult(4, info);
+ }
+
+ tran.CommitTran();
+ }
+
+ return NewErpResult(0, "鐢熸垚鍑哄簱鍗曟垚鍔�);
}
catch (Exception ex) {
info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
diff --git a/api/ApiModel.cs b/api/ApiModel.cs
index 14b9366..4b66d75 100644
--- a/api/ApiModel.cs
+++ b/api/ApiModel.cs
@@ -175,12 +175,12 @@
/// 鐗╂枡瑙勬牸
/// </summary>
[JsonProperty("s_spec")]
- public string s_spec { get; set; }
+ public string Spec { get; set; }
/// <summary>
/// 鏁伴噺
/// </summary>
[JsonProperty("n_num")]
- public int n_num { get; set; }
+ public int Num { get; set; }
/// <summary>
/// 璧风偣璐т綅淇℃伅
/// </summary>
@@ -273,54 +273,20 @@
public string StartLoc { get; set; }
}
- public class EmptyInboundDetailInfo { }
-
- //public class EmptyOnlineInfo {
- // public string ItemCode { get; set; }
- // public string ItemName { get; set; }
- // public string PatchNo { get; set; }
- // public string EndLoc { get; set; }
- //}
-
public class EmptyOnlinePalletInfo {
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
-
[JsonProperty("item_code")]
public string ItemCode { get; set; }
- ///// <summary>
- ///// 鐗╂枡鍚嶇О
- ///// </summary>
- //
- //[JsonProperty("item_name")]
- //public string ItemName { get; set; }
- /// <summary>
- /// 鎵规鍙�- /// </summary>
-
[JsonProperty("batch_no")]
public string BatchNo { get; set; }
- /// <summary>
- /// 鐗╂枡瑙勬牸
- /// </summary>
[JsonProperty("spe")]
- public string Spe { get; set; }
- /// <summary>
- /// 瀹瑰櫒缂栫爜
- /// </summary>
+ public string Spec { get; set; } // 鐗╂枡瑙勬牸
[JsonProperty("cnt_id")]
- public string CntId { get; set; }
- // 瀹瑰櫒绫诲瀷 = 鎵樼洏
+ public string CntId { get; set; } // 瀹瑰櫒绫诲瀷 = 鎵樼洏
}
public class EmptyOnlineGoodpackInfo {
- // 瀹瑰櫒绫诲瀷 = 濂借繍绠�- /// <summary>
- /// 瀹瑰櫒缂栫爜
- /// </summary>
[JsonProperty("cnt_id")]
- public string CntId { get; set; }
+ public string CntId { get; set; } // 瀹瑰櫒绫诲瀷 = 濂借繍绠� }
/// <summary>
@@ -333,12 +299,6 @@
[JsonProperty("item_code")]
public string ItemCode { get; set; }
- ///// <summary>
- ///// 鐗╂枡鍚嶇О
- ///// </summary>
- //
- //[JsonProperty("item_name")]
- //public string ItemName { get; set; }
/// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
@@ -490,21 +450,10 @@
/// 鐗╂枡淇℃伅涓嬪彂鍚屾 鏁版嵁绫� /// </summary>
public class CgInfoSyncInfo {
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
[JsonProperty("itemName")]
public string ItemName { get; set; }
-
- /// <summary>
- /// 浜у搧鐗屽彿
- /// </summary>
[JsonProperty("itemCode")]
public string ItemCode { get; set; }
-
- /// <summary>
- /// 鎵规鍙�- /// </summary>
[JsonProperty("batchNo")]
public string BatchNo { get; set; }
@@ -577,11 +526,52 @@
/// </summary>
public class ErpSendOutboundOrderInfo {
public string ErpNo { get; set; } // ERP 鍗曞彿
-
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [JsonProperty("item_code")]
+ public string ItemCode { get; set; }
+ ///// <summary>
+ ///// 鐗╂枡鍚嶇О
+ ///// </summary>
+ //[JsonProperty("item_name")]
+ //public string ItemName { get; set; }
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [JsonProperty("spe")]
+ public string Spe { get; set; }
+ /// <summary>
+ /// 鎵规鍙�+ /// </summary>
+ [JsonProperty("batch_no")]
+ public string BatchNo { get; set; }
+ /// <summary>
+ /// 闇�嚭搴撴暟閲�+ /// </summary>
+ [JsonProperty("qty")]
+ public int Qty { get; set; }
+ /// <summary>
+ /// 瀹瑰櫒绫诲瀷
+ /// </summary>
+ [JsonProperty("cntr_type")]
+ public string CntrType { get; set; }
+ /// <summary>
+ /// 鍑哄簱缁堢偣璐у尯
+ /// </summary>
+ [JsonProperty("end_area")]
+ public string EndArea { get; set; }
+ /// <summary>
+ /// 鏄惁寮哄埗鍑哄簱
+ /// </summary>
+ [JsonProperty("force_out")]
+ public bool ForcedOut { get; set; }
+
}
public class PickUpReturnErpInfo {
public string LocCode { get; set; }
+
}
}
}
diff --git a/api/DebugController.cs b/api/DebugController.cs
index 0a242b0..76e5b30 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -4,12 +4,15 @@
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 static HH.WCS.Mobox3.DSZSH.api.ApiModel;
+using static HH.WCS.Mobox3.DSZSH.core.Monitor;
namespace HH.WCS.Mobox3.DSZSH.api {
/// <summary>
@@ -267,19 +270,19 @@
var db = new SqlHelper<object>().GetInstance();
try {
var cgDetailList = db.Queryable<TN_CG_Detail>().ToList();
- var cntrItemList = new List<TN_Container_Item>();
+ var cntrItemList = new List<TN_Container_ItemType>();
foreach (var cgDetail in cgDetailList) {
- if (db.Queryable<TN_Container_Item>().Where(i => i.S_CNTR_CODE == cgDetail.S_CNTR_CODE).Any()) {
+ if (db.Queryable<TN_Container_ItemType>().Where(i => i.S_CNTR_CODE == cgDetail.S_CNTR_CODE).Any()) {
continue;
}
- cntrItemList.Add(new TN_Container_Item {
+ 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_Item>(cntrItemList).ExecuteCommand() <= 0) {
+ if (db.Insertable<TN_Container_ItemType>(cntrItemList).ExecuteCommand() <= 0) {
return "鎻掑叆澶辫触";
}
@@ -301,12 +304,12 @@
public string InsertContainerItem(InsertCntrItemInfo cgDetail) {
var db = new SqlHelper<object>().GetInstance();
try {
- var cntrItem = new TN_Container_Item {
+ var cntrItem = new TN_Container_ItemType {
S_CNTR_CODE = cgDetail.Cntr,
S_ITEM_CODE = cgDetail.Item,
};
- if (db.Insertable<TN_Container_Item>(cntrItem).ExecuteCommand() <= 0) {
+ if (db.Insertable<TN_Container_ItemType>(cntrItem).ExecuteCommand() <= 0) {
return "鎻掑叆澶辫触";
}
@@ -318,6 +321,169 @@
return ex.Message;
}
}
+
+ [HttpPost]
+ [Route("AddInboundTask")]
+ public string AddInboundTask(AddInboundTaskInfo 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();
+
+ if (startLoc == null) {
+ info = $"璧风偣浣嶇疆 '{startLocCode}' 涓嶅瓨鍦ㄦ垨涓嶅叿澶囧彇璐ц姹�;
+ LogHelper.Info(info);
+ return info;
+ }
+
+ // 缁戝畾璐т綅鍜屽鍣ㄥ彿
+ 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.K绌烘墭瀛樻斁鍖篯.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();
+
+ if (endLoc == null) {
+ info = "绌烘墭鍏ュ簱鏆傛椂娌℃湁鍚堥�鐨勮揣浣嶅彲浠ュ叆搴�;
+ LogHelper.Info(info);
+ return info;
+ }
+
+ var cntId = locCntrRel.S_CNTR_CODE;
+ var task = WCSHelper.BuildTask(startLoc, endLoc, cntId, taskName);
+
+ LocationHelper.LockLoc(ref startLoc, 2); // 璧风偣鍑哄簱閿�+ LocationHelper.LockLoc(ref endLoc, 1); // 缁堢偣鍏ュ簱閿�+
+ 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;
+ }
+
+ // 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;
+ }
+
+ }
+ catch (Exception ex) {
+ LogHelper.InfoEx(ex);
+ return ex.Message;
+ }
+ }
+ }
+
+ public class AddInboundTaskInfo {
+ public string ItemCode { get; set; }
+ public string BatchNo { get; set; }
+ public string CntrCode { get; set; }
+ public string StartLoc { get; set; }
}
/// <summary>
diff --git a/api/ErpController.cs b/api/ErpController.cs
index 48260b4..14132b3 100644
--- a/api/ErpController.cs
+++ b/api/ErpController.cs
@@ -16,6 +16,8 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
+ [HttpPost]
+ [Route("ErpSendOutboundOrder")]
public ErpResult ErpSendOutboundOrder(ErpSendOutboundOrderInfo model) {
var apiName = "ERP涓嬪彂鍑哄簱浠诲姟";
LogHelper.InfoApi(apiName, model);
diff --git a/api/MoboxController.cs b/api/MoboxController.cs
index 9a097a3..2e666f3 100644
--- a/api/MoboxController.cs
+++ b/api/MoboxController.cs
@@ -14,7 +14,7 @@
[RoutePrefix("api")]
public class MoboxController : ApiController {
/// <summary>
- /// 濂借繍绠�婊℃墭涓嬬嚎鍏ュ簱(PDA)
+ /// 濂借繍绠�婊＄涓嬬嚎鍏ュ簱(PDA)
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
diff --git a/core/Monitor.cs b/core/Monitor.cs
index 9c58898..50fd5a9 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -67,14 +67,14 @@
};
// BEG 姣忔杞閮芥鏌ュ搴斿鍣ㄦ槸鍚﹀凡鐧昏锛岀櫥璁板垯鏇存柊锛屾湭鐧昏鍒欐彃鍏�- var cntrItemRel = db.Queryable<TN_Container_Item>()
+ 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_Item {
+ cntrItemRel = new TN_Container_ItemType {
S_ITEM_CODE = itemCode,
S_CNTR_CODE = cntrCode,
};
@@ -137,7 +137,7 @@
// BEG 鎻掑叆鎴栨洿鏂板鍣ㄤ笌鐗╂枡绫诲瀷鐨勭粦瀹氳〃
if (insertTable) {
- if (db.Insertable<TN_Container_Item>(cntrItemRel).ExecuteCommand() <= 0) {
+ if (db.Insertable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐧昏瀹瑰櫒鐗╂枡绫诲瀷缁戝畾琛ㄥけ璐ワ細鐗╂枡缂栫爜{cntrItemRel.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cntrItemRel.S_CNTR_CODE}";
LogHelper.Info(info);
@@ -145,7 +145,7 @@
}
}
else {
- if (db.Updateable<TN_Container_Item>(cntrItemRel).ExecuteCommand() <= 0) {
+ if (db.Updateable<TN_Container_ItemType>(cntrItemRel).ExecuteCommand() <= 0) {
tran.RollbackTran();
info = $"鐧昏瀹瑰櫒鐗╂枡绫诲瀷缁戝畾琛ㄥけ璐ワ細鐗╂枡缂栫爜{cntrItemRel.S_ITEM_CODE}锛屽鍣ㄧ紪鐮亄cntrItemRel.S_CNTR_CODE}";
LogHelper.Info(info);
@@ -288,7 +288,7 @@
LogHelper.Info($"杞--{taskName}锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛佸崟鍙�{detail.S_OO_NO}'瑕佹眰缁堢偣搴撳尯涓�{detail.S_END_AREA}'");
continue;
}
-
+
detail.N_B_STATE = 2;
var cntId = detail.S_CNTR_CODE;
diff --git a/core/WCSCore.cs b/core/WCSCore.cs
index a9985d1..aafecbe 100644
--- a/core/WCSCore.cs
+++ b/core/WCSCore.cs
@@ -88,9 +88,9 @@
var nextOutboundTask = Task.Run(() => {
UpdateOutboundTaskState(3);
});
- var pickUpReturnErpTask = Task.Run(() => {
- PickUpReturnErp(TN_Task);
- });
+ //var pickUpReturnErpTask = Task.Run(() => {
+ // PickUpReturnErp(TN_Task);
+ //});
}
break;
@@ -110,6 +110,10 @@
// });
//}
+ var recordTask = Task.Run(() => {
+ RecordTaskTable(TN_Task);
+ });
+
break;
case 7: // 寮傚父
TaskProcess.OperateStatus(TN_Task, 7); // 寮傚父澶勭悊
@@ -124,6 +128,66 @@
return true;
}
+ private static void RecordTaskTable(TN_Task task) {
+ var db = new SqlHelper<object>().GetInstance();
+ var info = "";
+ try {
+ var cgDetail = new TN_CG_Detail();
+
+ var emptyTask = false;
+ if (task.S_TYPE != TaskName.H濂借繍绠盻绌虹涓婄嚎 && task.S_TYPE != TaskName.H濂借繍绠盻绌虹鍏ュ簱 &&
+ task.S_TYPE != TaskName.T鎵樼洏_绌烘墭涓婄嚎 && task.S_TYPE != TaskName.T鎵樼洏_绌烘墭鍏ュ簱) {
+ // 闈炵┖鎵樹换鍔★紙绌烘墭浠诲姟鏃犳硶鍦–GDetail鏌ュ埌鐗╂枡淇℃伅锛�+ emptyTask= true;
+ cgDetail = db.Queryable<TN_CG_Detail>()
+ .Where(d => d.S_CNTR_CODE == task.S_CNTR_CODE)
+ .First();
+
+ if (cgDetail == null) {
+ info = $"浠诲姟{task.S_CODE}瀹屾垚锛岃褰曞嚭鍏ュ簱澶辫触锛氭棤娉曞湪瀹瑰櫒璐у搧鏄庣粏琛ㄤ腑鎵惧埌鎵樼洏{task.S_CNTR_CODE}瀵瑰簲鐨勭墿鏂�;
+ LogHelper.Info(info);
+ }
+ }
+
+ var isInbound = false;
+ var inboundTasks = new List<string> {
+ TaskName.H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱, TaskName.H濂借繍绠盻绌虹鍏ュ簱, TaskName.T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱, TaskName.T鎵樼洏_绌烘墭鍏ュ簱,
+ TaskName.C鎶芥_鍚堟牸鍥炲簱, TaskName.C鎶芥_涓嶅悎鏍肩Щ搴� TaskName.Y绉诲簱
+ };
+ if (inboundTasks.Contains(task.S_TYPE)) {
+ isInbound= true;
+ }
+
+ 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_LOC_CODE = isInbound ? task.S_END_LOC : task.S_START_LOC, // 鍏ュ簱璁板綍缁堢偣璐т綅锛屽嚭搴撹褰曡捣鐐硅揣浣�+ S_CNTR_CODE = task.S_CNTR_CODE,
+ 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,
+ T_RECORD_TIME = DateTime.Now,
+ S_TYPE = task.S_TYPE,
+ S_BS_CODE = task.S_BS_TYPE,
+ };
+
+ if (db.Insertable<TN_Record_Table>(record).ExecuteCommand() <= 0) {
+ info = "鎻掑叆鍑哄叆搴撹褰曡〃澶辫触锛� + JsonConvert.SerializeObject(record);
+ LogHelper.Info(info);
+ return;
+ }
+
+ info = "鎻掑叆鍑哄叆搴撹褰曡〃鎴愬姛";
+ LogHelper.Info(info);
+ }
+ catch (Exception ex) {
+ LogHelper.InfoEx(ex);
+ }
+ }
+
public static ReturnResult SafetyInteraction(SafetyInteractionInfo model) {
var db = new SqlHelper<object>().GetInstance();
var info = "";
diff --git a/models/TN_Container_ItemType.cs b/models/TN_Container_ItemType.cs
new file mode 100644
index 0000000..f96c228
--- /dev/null
+++ b/models/TN_Container_ItemType.cs
@@ -0,0 +1,23 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using SqlSugar;
+
+namespace HH.WCS.Mobox3.DSZSH.models {
+ /// <summary>
+ /// 瀹瑰櫒-鐗╂枡绫诲瀷 鍏崇郴琛紙濂借繍绠变篃璁板綍锛岄槻姝㈠悗缁渶姹傚彉鏇达級
+ /// </summary>
+ /// <remarks>
+ /// 1. 绌烘墭涓婄嚎鏃讹紝濡傛灉鍏崇郴琛ㄤ腑娌℃湁鎵樼洏淇℃伅锛屼笉妫�煡锛涘惁鍒欙紝鍒ゆ柇鎵樼洏鏄惁鍚堥�<br/>
+ /// 2. 婊℃墭涓嬬嚎鏃讹紝濡傛灉鍏崇郴琛ㄤ腑娌℃湁鎵樼洏淇℃伅锛岃褰曡繘鍘伙紱鍚﹀垯锛屼笉鏀瑰彉鍘熸湁璁板綍锛堜笉鏇存柊锛�+ /// </remarks>
+ [SugarTable("TN_Container_ItemType")]
+ public class TN_Container_ItemType : BaseModel {
+ public string S_CNTR_CODE { get; set; }
+ public string S_CNTR_TYPE { get; set; }
+ public string S_ITEM_CODE { get; set; }
+ }
+}
diff --git a/models/TN_Record_Table.cs b/models/TN_Record_Table.cs
index ce93f4f..0154c71 100644
--- a/models/TN_Record_Table.cs
+++ b/models/TN_Record_Table.cs
@@ -11,7 +11,7 @@
/// 鍑哄叆璁板綍琛� /// </summary>
[SugarTable("TN_Record_Table")]
- public class TN_Record_Table {
+ public class TN_Record_Table : BaseModel {
/// <summary>
/// 浠诲姟鍙� /// </summary>
@@ -28,6 +28,11 @@
public string S_ITEM_CODE { get; set; }
/// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ public string S_ITEM_NAME { get; set; }
+
+ /// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
public string S_ITEM_SPEC { get; set; }
@@ -38,11 +43,6 @@
public string S_BATCH_NO { get; set; }
/// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string S_ITEM_NAME { get; set; }
-
- /// <summary>
/// 璁板綍鏃堕棿
/// </summary>
public DateTime T_RECORD_TIME { get; set; }
@@ -50,17 +50,12 @@
/// <summary>
/// 鏁伴噺
/// </summary>
- public int F_QTY { get; set; } = 0;
+ public int N_QTY { get; set; } = 0;
/// <summary>
- /// 璧风偣璐т綅缂栫爜
+ /// 璐т綅缂栫爜锛堝簱鍐呰揣浣嶏紝鍏ュ簱灏辨槸缁堢偣锛屽嚭搴撳氨鏄捣鐐癸級
/// </summary>
- public string S_START_LOC { get; set; }
-
- /// <summary>
- /// 缁堢偣璐т綅缂栫爜
- /// </summary>
- public string S_END_LOC { get; set; }
+ public string S_LOC_CODE { get; set; }
/// <summary>
/// 鏉ユ簮鍗曞彿
@@ -71,21 +66,6 @@
/// 鍗曟嵁绫诲瀷
/// </summary>
public string S_TYPE { get; set; }
-
- /// <summary>
- /// 鎵樼洏鍒濆鏁伴噺
- /// </summary>
- public float F_INITIAL_QTY { get; set; } = 0;
-
- /// <summary>
- /// 鏈�粓鏁伴噺
- /// </summary>
- public float F_ALL_QTY { get; set; } = 0;
-
- /// <summary>
- /// 鐗╂枡浠ｇ爜
- /// </summary>
- public string S_ITEM_NO { get; set; }
/// <summary>
/// 鎵ц鏍囧噯
diff --git a/util/Settings.cs b/util/Settings.cs
index d510507..6e5fc9b 100644
--- a/util/Settings.cs
+++ b/util/Settings.cs
@@ -12,7 +12,7 @@
{
public static string WebApiUrl { get; set; }
public static string NdcApiUrl { get; set; }
- public static string ErpApiUrl { get; set; } // ERP 鍙嶉鎺ュ彛
+ public static string ErpApiUrl { get; set; } // ERP 鍙嶉鎺ュ彛URL
public static string SqlServer { get; set; }
public static string TcpServerIp { get; set; }
public static int TcpServerPort { get; set; }
@@ -155,14 +155,12 @@
public const string H濂借繍绠盻婊＄涓嬬嚎鍏ュ簱 = "濂借繍绠�婊＄涓嬬嚎鍏ュ簱";
public const string H濂借繍绠盻绌虹涓婄嚎 = "濂借繍绠�绌虹涓婄嚎";
public const string H濂借繍绠盻绌虹鍏ュ簱 = "濂借繍绠�绌虹鍏ュ簱";
- public const string H濂借繍绠盻绌虹缁戝畾 = "濂借繍绠�绌虹缁戝畾";
public const string C鎴愬搧鑳跺嚭搴�= "鎴愬搧鑳跺嚭搴�;
public const string T鎵樼洏_婊℃墭涓嬬嚎鍏ュ簱 = "鎵樼洏-婊℃墭涓嬬嚎鍏ュ簱";
public const string T鎵樼洏_绌烘墭涓婄嚎 = "鎵樼洏-绌烘墭涓婄嚎";
public const string T鎵樼洏_绌烘墭鍏ュ簱 = "鎵樼洏-绌烘墭鍏ュ簱";
- public const string T鎵樼洏_绌烘墭缁戝畾 = "鎵樼洏-绌烘墭缁戝畾";
public const string C鎶芥_涓嶅悎鏍肩Щ搴�= "鎶芥-涓嶅悎鏍肩Щ搴�;
public const string C鎶芥_鍑哄簱 = "鎶芥-鍑哄簱";
diff --git a/wms/WCSHelper.cs b/wms/WCSHelper.cs
index dddbe4a..d341fde 100644
--- a/wms/WCSHelper.cs
+++ b/wms/WCSHelper.cs
@@ -55,7 +55,7 @@
S_END_LOC = endLoc.S_CODE,
S_TYPE = type,
N_PRIORITY = 3, // 鍒濆浼樺厛绾ч粯璁や负锛�
- N_SCHEDULE_TYPE = 3, // 鍥借嚜
+ N_SCHEDULE_TYPE = 1, // NDC
N_B_STATE = 0,
S_CNTR_CODE = cntId,
};
@@ -63,6 +63,25 @@
return TN_Task;
}
+ public static TN_Task BuildErpTask(TN_Location startLoc, TN_Location endLoc, string cntId, string type, string erpNo) {
+ TN_Task TN_Task = new TN_Task() {
+ S_CODE = GenerateTaskNo(),
+ S_START_AREA = startLoc.S_AREA_CODE,
+ S_END_AREA = endLoc.S_AREA_CODE,
+ S_START_LOC = startLoc.S_CODE,
+ S_END_LOC = endLoc.S_CODE,
+ S_TYPE = type,
+ N_PRIORITY = 3, // 鍒濆浼樺厛绾ч粯璁や负锛�
+ N_SCHEDULE_TYPE = 1, // NDC
+ N_B_STATE = 0,
+ S_CNTR_CODE = cntId,
+ S_BS_NO = erpNo,
+ S_BS_TYPE = "ERP",
+ };
+
+ return TN_Task;
+ }
+
public static TN_Task BuildTask(TN_Loc_Container locCntrRel, TN_Location endLoc, string cntId, string type) {
var fromLoc = LocationHelper.GetLocation(locCntrRel.S_LOC_CODE);
--
Gitblit v1.9.1