From 656f90b301ba307c909de4ee94b88af817adf0d8 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 14 七月 2025 16:18:22 +0800
Subject: [PATCH] 添加CgDetail信息同步字段和锁状态字段，修改相关逻辑
---
HH.WCS.Mobox3.AnGang.csproj | 4
models/TN_CG_Detail.cs | 54 ++++++
/dev/null | 41 -----
core/Monitor.cs | 149 ++----------------
api/ApiHelper.cs | 134 ----------------
api/MoboxController.cs | 44 +----
6 files changed, 86 insertions(+), 340 deletions(-)
diff --git a/HH.WCS.Mobox3.AnGang.csproj b/HH.WCS.Mobox3.AnGang.csproj
index 0b624af..457112a 100644
--- a/HH.WCS.Mobox3.AnGang.csproj
+++ b/HH.WCS.Mobox3.AnGang.csproj
@@ -270,10 +270,6 @@
<Compile Include="models\TN_AG_Count_Diff.cs" />
<Compile Include="models\TN_AG_Count_Order.cs" />
<Compile Include="models\TN_AG_Count_Plan.cs" />
- <Compile Include="models\TN_Count_CG_Detail.cs" />
- <Compile Include="models\TN_Count_Diff.cs" />
- <Compile Include="models\TN_Count_Order.cs" />
- <Compile Include="models\TN_Count_Plan.cs" />
<Compile Include="models\TN_Inbound_DataRecord.cs" />
<Compile Include="models\TN_Outbound_DataRecord.cs" />
<Compile Include="core\WMSCore.cs" />
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 009a34b..1d27797 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -191,6 +191,7 @@
S_CNTR_CODE = cntId,
//S_ITEM_NAME = model.ItemName,
S_LOC_CODE = startLoc.S_CODE, // ADD锛氳ˉ鍏呴拡瀵筆DA鍒嗘嫞
+ N_LOCK_STATE = locCntrRel.N_LOCK_STATE,
};
startLoc.N_CURRENT_NUM = 1;
@@ -926,7 +927,7 @@
foreach (var transaction in model.stockTransactions) {
var recordOld = db.Queryable<TN_Inbound_DataRecord>()
- .Where(r => r.S_LOCATION_CODE == "HJQ-" + transaction.locationCode.Trim()).First();
+ .Where(r => r.S_LOCATION_CODE == transaction.locationCode.Trim()).First();
if (recordOld != null) {
deleteRecordOldList.Add(recordOld);
//errList.Add(recordOld);
@@ -935,7 +936,7 @@
// 鍐欏叆璁板綍琛� var record = new TN_Inbound_DataRecord {
- S_LOCATION_CODE = "HJQ-" + transaction.locationCode.Trim(),
+ S_LOCATION_CODE = transaction.locationCode.Trim(),
S_STOCK_TRANS = transaction.stockTransactionId,
S_ITEM_CODE = transaction.itemCode,
S_ITEM_NAME = transaction.itemName,
@@ -1024,7 +1025,7 @@
var deleteRecordOldList = new List<TN_Outbound_DataRecord>();
foreach (var issue in model.materialIssues) {
var recordOld = db.Queryable<TN_Outbound_DataRecord>()
- .Where(r => r.S_LOCATION_CODE == "HJQ-" + issue.locationCode.Trim()).First();
+ .Where(r => r.S_LOCATION_CODE == issue.locationCode.Trim()).First();
if (recordOld != null) {
deleteRecordOldList.Add(recordOld);
//errList.Add(recordOld);
@@ -1033,7 +1034,7 @@
// 鍐欏叆璁板綍琛� var record = new TN_Outbound_DataRecord {
- S_LOCATION_CODE = "HJQ-" + issue.locationCode.Trim(),
+ S_LOCATION_CODE = issue.locationCode.Trim(),
S_ORDER_NO = issue.withdrawalOrderNo,
S_ITEM_CODE = issue.itemCode,
S_ITEM_NAME = issue.itemName,
@@ -1098,7 +1099,7 @@
}
}
- // 鐩樼偣鍔熻兘锛堟柊锛�+ // 鐩樼偣鍔熻兘锛堟柊锛�-----------------------------------
internal static SimpleResult CheckOutboundOnce(CheckOutboundOnceInfo model) {
var taskName = TaskName.鐩樼偣鐞嗚揣鍑哄簱;
@@ -1185,8 +1186,6 @@
return BuildSimpleResult(1, $"鍙戠敓浜嗗紓甯革細{ex.Message}");
}
}
-
- // 澶囩敤锛氱洏鐐圭浉鍏冲姛鑳斤紙鎭㈠锛�-----------------------------
/// <summary>
/// 鐩樼偣鐞嗚揣鍑哄簱(WMS)
@@ -1329,127 +1328,6 @@
return BuildSimpleResult(1, $"鍙戠敓浜嗗紓甯革細{ex.Message}");
}
}
-
- //public static SimpleResult CreateCountPlan(CreateCountPlanInfo model) {
- // var db = new SqlHelper<object>().GetInstance();
- // try {
-
- // var countPlan = new TN_Count_Plan() {
- // S_CP_NO = GenerateNo("鐩樼偣璁″垝", "PDJH"), // CP =銆婸DJH
- // S_TYPE = model.countType,
- // };
-
- // if (model.countType == "璐т綅") {
- // countPlan.S_LOC_CODE = model.targetId;
- // }
- // else if (model.countType == "鐗╂枡") {
- // countPlan.S_ITEM_CODE = model.targetId;
- // }
- // else {
- // return BuildSimpleResult(2, $"鍒涘缓鐩樼偣璁″垝澶辫触锛氫笉鍚堟硶鐨勭洏鐐圭被鍨�'{model.countType}'");
- // }
-
- // if (db.Insertable<TN_Count_Plan>(countPlan).ExecuteCommand() <= 0) {
- // return BuildSimpleResult(2, "鍒涘缓鐩樼偣璁″垝澶辫触");
- // }
-
- // return BuildSimpleResult(0, "鍒涘缓鐩樼偣璁″垝鎴愬姛");
-
- // }
- // catch (Exception ex) {
-
- // return BuildSimpleResult(1, ex.Message);
- // }
- //}
-
- //public static SimpleResult CreateCountOrder(CreateCountOrderInfo model) {
- // var db = new SqlHelper<object>().GetInstance();
- // var info = "";
- // try {
- // var countPlan = db.Queryable<TN_Count_Plan>()
- // .Where(a => a.S_CP_NO == model.planId).First();
-
- // if (countPlan == null) {
- // return BuildSimpleResult(2, $"鐩樼偣璁″垝鍗曞彿 '{model.planId}' 涓嶅瓨鍦�);
- // }
-
- // var countOrder = new TN_Count_Order() {
- // S_CP_NO = model.planId,
- // S_COUNT_NO = GenerateNo("鐩樼偣鍗�, "PDD"), // CN =銆婸DD
- // };
-
- // var countDetailList = new List<TN_Count_CG_Detail>();
- // if (countPlan.S_TYPE == "璐т綅") {
- // var cgDetail = db.Queryable<TN_Location, TN_Loc_Container, TN_CG_Detail>
- // ((l, c, d) => l.S_CODE == c.S_LOC_CODE && c.S_CNTR_CODE == d.S_CNTR_CODE)
- // .Where(l => l.S_CODE == countPlan.S_LOC_CODE)
- // .Select((l, c, d) => d).First();
-
- // if (cgDetail == null) {
- // return BuildSimpleResult(3, $"鏈壘鍒版寚瀹氳揣浣峽countPlan.S_LOC_CODE}涓婄殑鐗╂枡");
- // }
-
- // var countDetail = new TN_Count_CG_Detail {
- // S_COUNT_NO = countOrder.S_COUNT_NO,
- // S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- // S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- // };
-
- // countDetailList.Add(countDetail);
- // }
- // else if (countPlan.S_TYPE == "鐗╂枡") {
- // var cgDetail = db.Queryable<TN_CG_Detail>()
- // .Where(d => d.S_ITEM_CODE == countPlan.S_ITEM_CODE).First(); // ToList -> First
-
- // if (cgDetail == null) {
- // return BuildSimpleResult(3, $"鏈壘鍒版寚瀹氱殑鐗╂枡{countPlan.S_ITEM_CODE}");
- // }
-
- // //foreach (var cgDetail in cgDetailList) {
- // // var countDetail = new TN_Count_CG_Detail {
- // // S_COUNT_NO = countOrder.S_COUNT_NO,
- // // S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- // // S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- // // };
-
- // // countDetailList.Add(countDetail);
- // //}
-
- // var countDetail = new TN_Count_CG_Detail {
- // S_COUNT_NO = countOrder.S_COUNT_NO,
- // S_CNTR_CODE = cgDetail.S_CNTR_CODE,
- // S_ITEM_CODE = cgDetail.S_ITEM_CODE,
- // };
-
- // countDetailList.Add(countDetail);
- // }
- // else {
- // return BuildSimpleResult(3, $"璁″垝鍗�{model.planId}'鐨勭被鍨媨countPlan.S_TYPE}涓嶅悎娉�);
- // }
-
- // using (var tran = db.Ado.UseTran()) {
- // if (db.Insertable<TN_Count_Order>(countOrder).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // info = "鍒涘缓鐩樼偣鍗曞け璐�;
- // return BuildSimpleResult(2, info);
- // }
-
- // if (db.Insertable<TN_Count_CG_Detail>(countDetailList).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // info = "鍒涘缓鐩樼偣鍗曟槑缁嗗け璐�;
- // return BuildSimpleResult(3, info);
- // }
-
- // tran.CommitTran();
- // }
-
- // return BuildSimpleResult(0, "鍒涘缓鐩樼偣鍗曟垚鍔�);
- // }
- // catch (Exception ex) {
-
- // return BuildSimpleResult(1, $"鍙戠敓浜嗗紓甯革細{ex.Message}");
- // }
- //}
public static SimpleResult CountProduct(CountProductInfo model) {
var db = new SqlHelper<object>().GetInstance();
diff --git a/api/MoboxController.cs b/api/MoboxController.cs
index 3591f09..dacb5a9 100644
--- a/api/MoboxController.cs
+++ b/api/MoboxController.cs
@@ -86,80 +86,54 @@
return ApiHelper.CancelTask(model);
}
- // 鐩樼偣鍔熻兘锛堟柊锛�+ // 鐩樼偣鍔熻兘锛堟柊锛�-----------------------------------
/// <summary>
- /// 鐩樼偣鐞嗚揣鍑哄簱(WMS)
+ /// 鐩樼偣鐞嗚揣鍑哄簱
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
[Route("CheckOutboundOnce")]
public SimpleResult CheckOutboundOnce(CheckOutboundOnceInfo model) {
- LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у嚭搴�WMS)" + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у嚭搴� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.CheckOutboundOnce(model);
}
- // 澶囩敤锛氱洏鐐圭浉鍏冲姛鑳斤紙鎭㈠锛�-----------------------------------
-
- ///// <summary>
- ///// 鍒涘缓鐩樼偣璁″垝鍗�WMS)
- ///// </summary>
- ///// <param name="model"></param>
- ///// <returns></returns>
- //[HttpPost]
- //[Route("CreateCountPlan")]
- //public SimpleResult CreateCountPlan(CreateCountPlanInfo model) {
- // LogHelper.Info("瑙﹀彂API锛氬垱寤虹洏鐐硅鍒掑崟(WMS)" + JsonConvert.SerializeObject(model), "API");
- // return ApiHelper.CreateCountPlan(model);
- //}
-
- ///// <summary>
- ///// 鍒涘缓鐩樼偣鍗�PDA)
- ///// </summary>
- ///// <param name="model"></param>
- ///// <returns></returns>
- //[HttpPost]
- //[Route("CreateCountOrder")]
- //public SimpleResult CreateCountOrder(CreateCountOrderInfo model) {
- // LogHelper.Info("瑙﹀彂API锛氬垱寤虹洏鐐瑰崟(PDA)" + JsonConvert.SerializeObject(model), "API");
- // return ApiHelper.CreateCountOrder(model);
- //}
-
/// <summary>
- /// 鐩樼偣鐞嗚揣(PDA)
+ /// 鐩樼偣鐞嗚揣
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
[Route("CountProduct")]
public SimpleResult CountProduct(CountProductInfo model) {
- LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐�PDA)" + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.CountProduct(model);
}
/// <summary>
- /// 鐩樼偣鐞嗚揣鍑哄簱(WMS)
+ /// 鐩樼偣鐞嗚揣鍑哄簱-澶囩敤
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
[Route("CheckOutbound")]
public SimpleResult CheckOutbound(CheckOutboundInfo model) {
- LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у嚭搴�WMS)" + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у嚭搴� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.CheckOutbound(model);
}
/// <summary>
- /// 鐩樼偣鐞嗚揣鍥炲簱(WMS)
+ /// 鐩樼偣鐞嗚揣鍥炲簱-澶囩敤
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
[Route("CheckInbound")]
public SimpleResult CheckInbound(CheckInboundInfo model) {
- LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у洖搴�WMS)" + JsonConvert.SerializeObject(model), "API");
+ LogHelper.Info("瑙﹀彂API锛氱洏鐐圭悊璐у洖搴� + JsonConvert.SerializeObject(model), "API");
return ApiHelper.CheckInbound(model);
}
}
diff --git a/core/Monitor.cs b/core/Monitor.cs
index ec11518..b309a87 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -38,9 +38,21 @@
LogHelper.Info($"杞锛氬叆搴撲俊鎭悓姝ワ細璐т綅瀹瑰櫒琛ㄤ腑锛屽寘鍚揣浣�{locCntrRel.S_LOC_CODE}, 瀹瑰櫒={locCntrRel.S_CNTR_CODE}锛涗絾瀹瑰櫒瀵瑰簲鐨勭墿鏂欒〃锛屾病鏈夋壘鍒扮墿鏂欙紒");
continue;
}
+ // ERP 鏁版嵁 -> CG_Detail
cgDetail.S_ITEM_CODE = inboundData.S_ITEM_CODE;
+
+ cgDetail.S_ITEM_SHORT_DESC = inboundData.S_ITEM_SHORT_DESC; // 鐗╂枡鐭弿杩�+ //cgDetail.S_INVENTORY_MAN = inboundData.S_INVENTORY_MAN; // 搴撳瓨璐ｄ换浜哄鍚�+ cgDetail.S_IN_QUANTITY = inboundData.S_IN_QUANTITY; // 鍏ュ簱鏁伴噺
+ cgDetail.S_STOCK_QUANTITY = inboundData.S_STOCK_QUANTITY; // 搴撳瓨鏁伴噺
+ cgDetail.S_TOTAL_PRICE = inboundData.S_TOTAL_PRICE; // 搴撳瓨鎬讳环
+ cgDetail.S_STORE_KEEPER = inboundData.S_STORE_KEEPER;
+ cgDetail.S_LINE_CODE = inboundData.S_LINE_CODE;
+
cgDetail.T_MODIFY = DateTime.Now;
+
locCntrRel.N_LOCK_STATE = 1;
+ cgDetail.N_LOCK_STATE = 1;
locCntrRel.T_MODIFY = DateTime.Now;
needUpdateLocCntrRelList.Add(locCntrRel);
needUpdateCgDetailList.Add(cgDetail);
@@ -91,7 +103,7 @@
LogHelper.Info($"杞锛氬嚭搴撲俊鎭悓姝ワ細褰撳墠娌℃湁寰呭悓姝ョ殑ERP鐗╂枡淇℃伅");
return;
}
-
+
var needDeleteDataList = new List<TN_Outbound_DataRecord>();
var needUpdateLocCntrRelList = new List<TN_Loc_Container>();
var needUpdateCgDetailList = new List<TN_CG_Detail>();
@@ -105,8 +117,11 @@
continue;
}
cgDetail.S_ITEM_CODE = outboundData.S_ITEM_CODE;
+ cgDetail.S_STORE_KEEPER = outboundData.S_STORE_KEEPER;
+
cgDetail.T_MODIFY = DateTime.Now;
locCntrRel.N_LOCK_STATE = 1;
+ cgDetail.N_LOCK_STATE = 1;
locCntrRel.T_MODIFY = DateTime.Now;
needUpdateLocCntrRelList.Add(locCntrRel);
needUpdateCgDetailList.Add(cgDetail);
@@ -147,137 +162,7 @@
}
}
- // 鐩樼偣鍔熻兘锛堟柊锛�----------------------------------------
-
-
-
- // 澶囩敤锛氱洏鐐圭浉鍏冲姛鑳斤紙鎭㈠锛�-----------------------------------
-
- //public static void CheckCountOrder() {
- // var taskName = TaskName.鐩樼偣鐞嗚揣鍑哄簱;
- // var db = new SqlHelper<object>().GetInstance();
- // var info = "";
-
- // try {
- // var orderList = db.Queryable<TN_Count_Order>()
- // .Where(c => c.N_B_STATE == 1)
- // .OrderBy(c => c.T_CREATE, SqlSugar.OrderByType.Asc)
- // .ToList();
-
- // if (orderList.Count == 0) {
- // LogHelper.Info($"杞--{taskName}--鏆傛棤寰呮墽琛岀殑{taskName}鍗�);
- // return;
- // }
-
- // var detailList = new List<TN_Count_CG_Detail>();
- // foreach (var order in orderList) {
- // var doingCount = db.Queryable<TN_Count_CG_Detail>()
- // .Count(d => d.S_COUNT_NO == order.S_COUNT_NO && d.N_B_STATE >= 2); // 鎵ц涓�- // var allCount = db.Queryable<TN_Count_CG_Detail>()
- // .Count(d => d.S_COUNT_NO == order.S_COUNT_NO);
- // LogHelper.Info($"杞--{taskName}--缁熻{taskName}鍗�{order.S_COUNT_NO}'浠诲姟宸蹭笅鍙戯細{doingCount}/{allCount}");
-
- // if (doingCount == allCount) {
- // order.N_B_STATE = 2; // 鎵�湁浠诲姟閮藉凡鎵ц
- // db.Updateable<TN_Count_Order>(order).UpdateColumns(it => new { it.N_B_STATE }).ExecuteCommand();
- // continue;
- // }
-
- // var countCgDetailList = db.Queryable<TN_Count_CG_Detail>()
- // .Where(a => a.S_COUNT_NO == order.S_COUNT_NO && a.N_B_STATE == 1) // 宸蹭笅鍙�- // .ToList();
-
- // if (countCgDetailList.Count == 0) {
- // LogHelper.Info($"杞--{taskName}--{taskName}鍗曟槑缁嗙姸鎬佸紓甯�);
- // continue;
- // }
-
- // detailList.AddRange(countCgDetailList);
- // }
-
- // if (detailList.Count == 0) {
- // return;
- // }
-
- // foreach (var detail in detailList) {
- // 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 == detail.S_CNTR_CODE)
- // .First();
-
- // if (startLoc == null) {
- // LogHelper.Info($"杞--{taskName}锛氭病鏈夋壘鍒板悎閫傜殑璧风偣璐т綅锛�);
- // continue;
- // }
-
- // var endLoc = db.Queryable<TN_Location>()
- // .Where(a => Settings.Areas[0].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).First();
-
- // if (endLoc == null) {
- // LogHelper.Info($"杞--{taskName}锛氭病鏈夋壘鍒板悎閫傜殑缁堢偣璐т綅锛佸崟鍙蜂负 '{detail.S_COUNT_NO}'");
- // continue;
- // }
-
- // detail.N_B_STATE = 2;
-
- // var cntId = detail.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.Updateable<TN_Count_CG_Detail>(detail).UpdateColumns(it => it.N_B_STATE).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // LogHelper.Info($"杞--{taskName}--淇敼鏄庣粏琛ㄧ姸鎬佷负瀹屾垚澶辫触锛�);
- // }
-
- // 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}'澶辫触锛屽鍣ㄥ彿{cntId}锛岃捣鐐箋startLoc.S_CODE}锛岀粓鐐硅揣浣峽endLoc.S_CODE}";
- // LogHelper.Info(info);
- // continue;
- // }
-
- // 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}'澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
- // LogHelper.Info(info);
- // continue;
- // }
-
- // if (db.Insertable<TN_Task>(task).ExecuteCommand() <= 0) {
- // tran.RollbackTran();
- // info = $"鐢熸垚 {taskName} 澶辫触锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
- // LogHelper.Info(info);
- // continue;
- // }
-
- // tran.CommitTran();
- // info = $"鐢熸垚 {taskName} 鎴愬姛锛屽鍣ㄥ彿 {cntId} 锛岃捣鐐�{startLoc.S_CODE} 锛岀粓鐐硅揣浣�{endLoc.S_CODE}";
- // LogHelper.Info(info);
- // //continue;
- // }
- // }
- // }
- // catch (Exception ex) {
- // info = $"鍙戠敓浜嗗紓甯革細{ex.Message}";
- // LogHelper.Info(info);
- // }
- //}
+
}
}
diff --git a/models/TN_CG_Detail.cs b/models/TN_CG_Detail.cs
index eb02d7a..8070826 100644
--- a/models/TN_CG_Detail.cs
+++ b/models/TN_CG_Detail.cs
@@ -42,5 +42,59 @@
public string S_LOC_CODE { get; set; }
+ public int N_LOCK_STATE { get; set; } = 0;
+
+ // ------- ERP --------
+
+ /// <summary>
+ /// 鐗╂枡鐭弿杩�+ /// </summary>
+ public string S_ITEM_SHORT_DESC { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鏁伴噺
+ /// </summary>
+ public string S_STOCK_QUANTITY { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱鏁伴噺
+ /// </summary>
+ public string S_IN_QUANTITY { get; set; }
+
+ /// <summary>
+ /// 搴撳瓨鎬讳环
+ /// </summary>
+ public string S_TOTAL_PRICE { get; set; }
+
+ ///// <summary>
+ ///// 鍏ュ簱鏃堕棿
+ ///// </summary>
+ //public string S_STOCK_IN_TIME { get; set; }
+
+ /// <summary>
+ /// 淇濈鍛�+ /// </summary>
+ public string S_STORE_KEEPER { get; set; }
+
+ /// <summary>
+ /// 浜х嚎閮ㄩ棬浠ｇ爜
+ /// </summary>
+ public string S_LINE_CODE { get; set; }
+
+ ///// <summary>
+ ///// 閫佽揣鍗曡鍙�+ ///// </summary>
+ //public string S_DELIVERY_ITEM_NO { get; set; }
+
+ ///// <summary>
+ ///// 渚涘簲鍟嗗悕绉�+ ///// </summary>
+ //public string S_SUPPLIER_NAME { get; set; }
+
+ ///// <summary>
+ ///// 搴撳瓨璐ｄ换浜哄鍚�+ ///// </summary>
+ //public string S_INVENTORY_MAN { get; set; }
+
}
}
diff --git a/models/TN_Count_CG_Detail.cs b/models/TN_Count_CG_Detail.cs
deleted file mode 100644
index ce584a7..0000000
--- a/models/TN_Count_CG_Detail.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using SqlSugar;
-
-namespace HH.WCS.Mobox3.AnGang.models {
- /// <summary>
- /// 銆愭棫銆戠洏鐐瑰崟鏄庣粏琛�- /// </summary>
- [SugarTable("TN_Count_CG_Detail")]
- public class TN_Count_CG_Detail : BaseModel {
- public string S_COUNT_NO { get; set; }
- public string S_ITEM_CODE { get; set; }
- public string S_CNTR_CODE { get; set; }
-
- public int N_B_STATE { get; set; }
-
- }
-}
diff --git a/models/TN_Count_Diff.cs b/models/TN_Count_Diff.cs
deleted file mode 100644
index f2fb221..0000000
--- a/models/TN_Count_Diff.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using SqlSugar;
-
-namespace HH.WCS.Mobox3.AnGang.models {
- /// <summary>
- /// 銆愭棫銆戠洏鐐瑰樊寮傝〃
- /// </summary>
- [SugarTable("TN_Count_Diff")]
- public class TN_Count_Diff : BaseModel {
- public string S_COUNT_NO { get; set; }
- public string S_CNTR_CODE { get; set; }
- public float F_QTY { get; set; }
- public float F_ACTUAL_QTY { get; set; }
- public string S_ITEM_CODE { get; set; }
- }
-}
diff --git a/models/TN_Count_Order.cs b/models/TN_Count_Order.cs
deleted file mode 100644
index 6b7e5a0..0000000
--- a/models/TN_Count_Order.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using SqlSugar;
-
-namespace HH.WCS.Mobox3.AnGang.models {
- /// <summary>
- /// 銆愭棫銆戠洏鐐瑰崟琛�- /// </summary>
- [SugarTable("TN_Count_Order")]
- public class TN_Count_Order : BaseModel {
- public string S_CP_NO { get; set; }
-
- /// <summary>
- /// 鐩樼偣鍗曞彿
- /// </summary>
- public string S_COUNT_NO { get; set; }
-
- /// <summary>
- /// 涓氬姟鐘舵�锛�绛夊緟鎵ц 1宸叉墽琛屽緟鐢熸垚浠诲姟 2浠诲姟鎵ц涓�3浠诲姟瀹屾垚
- /// </summary>
- public int N_B_STATE { get; set; }
- }
-}
diff --git a/models/TN_Count_Plan.cs b/models/TN_Count_Plan.cs
deleted file mode 100644
index 910faa5..0000000
--- a/models/TN_Count_Plan.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-using SqlSugar;
-
-namespace HH.WCS.Mobox3.AnGang.models {
- /// <summary>
- /// 銆愭棫銆戠洏鐐硅鍒掕〃
- /// </summary>
- [SugarTable("TN_Count_Plan")]
- public class TN_Count_Plan : BaseModel {
- /// <summary>
- /// 鐩樼偣璁″垝鍙�- /// </summary>
- public string S_CP_NO { get; set; }
-
- /// <summary>
- /// 鐩樼偣绫诲瀷锛氳揣鐗╃洏鐐�璐т綅鐩樼偣
- /// </summary>
- public string S_TYPE { get; set; }
-
- /// <summary>
- /// 鐩樼偣鐘舵�锛� 鈥�鏈墽琛�1 鈥�鍚姩涓�2 鈥�鎵ц涓�3 鈥�瀹屾垚 4 鈥�鍑洪敊
- /// </summary>
- public int N_B_STATE { get; set; } = 0;
-
- ///// <summary>
- ///// 璁″垝鐩樼偣鐗╂枡鏁伴噺
- ///// </summary>
- //public int N_PLAN_TOTAL { get; set; }
-
- // ------
-
- public string S_LOC_CODE { get; set; } = "";
-
- public string S_ITEM_CODE { get; set; } = "";
- }
-}
--
Gitblit v1.9.1