From 656f90b301ba307c909de4ee94b88af817adf0d8 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 14 七月 2025 16:18:22 +0800
Subject: [PATCH] 添加CgDetail信息同步字段和锁状态字段，修改相关逻辑
---
api/ApiHelper.cs | 134 ++------------------------------------------
1 files changed, 6 insertions(+), 128 deletions(-)
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();
--
Gitblit v1.9.1