From 034839c93e9f18d2b77105a85f65c8400798d74c Mon Sep 17 00:00:00 2001
From: zxx <Zxx@HanInfo>
Date: 星期五, 30 五月 2025 08:31:10 +0800
Subject: [PATCH] 巨石
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/wms/ContainerHelper.cs | 80 ++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 39 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/wms/ContainerHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/wms/ContainerHelper.cs
index c6d587a..e7931e2 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/wms/ContainerHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JuShi/wms/ContainerHelper.cs
@@ -245,43 +245,43 @@
/// <param name="batchNo"></param>
/// <param name="qty"></param>
/// <returns></returns>
- internal static bool BindCntrItem(Container cntr, string itemCode, string batchNo, float qty, string putawayNo)
- {
- var res = false;
- var db = new SqlHelper<object>().GetInstance();
- try
- {
- db.BeginTran();
- //1.鏌ョ湅鏄惁鏈夌浉鍚岀墿鏂欐壒娆＄殑淇℃伅锛屽鏋滄湁瑕佺疮鍔狅紝涓嶅悓鎵规鐨勫彲浠ュ垎寮�- var cir = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE == cntr.S_CODE && a.S_ITEM_CODE == itemCode && a.S_BATCH_NO == batchNo).First();
- if (cir != null)
- {
- cir.F_QTY += qty;
- db.Updateable(cir).UpdateColumns(it => new { it.F_QTY,it.S_CK }).ExecuteCommand();
- }
- else
- {
- //2.鎻掑叆鏂扮殑瀹瑰櫒鐗╂枡淇℃伅锛堝鍣ㄥ彿涓嶅彉锛�- cir = new CntrItemDetail { S_CNTR_CODE = cntr.S_CODE.Trim(), S_BATCH_NO = batchNo, F_QTY = qty, S_ITEM_CODE = itemCode, S_PUTAWAY_NO = putawayNo};
- db.Insertable<CntrItemDetail>(cir).ExecuteCommand();
- }
- var count = db.Queryable<CntrItemDetail>().Count(a => a.S_CNTR_CODE == cntr.S_CODE);
- cntr.N_DETAIL_COUNT = count;
- cntr.C_ENABLE = "N";//鐮佺洏鍚庡皢鎵樼洏璁剧疆涓轰笉鍙敤鐘舵�锛屽叆搴撳悗鍙樻垚鍙敤
- //db.Updateable(cntr).UpdateColumns(it => new { it.N_DETAIL_COUNT, it.C_ENABLE, it.S_SRC }).ExecuteCommand();
- db.Updateable(cntr).UpdateColumns(it => new { it.N_DETAIL_COUNT, it.C_ENABLE }).ExecuteCommand();
+ //internal static bool BindCntrItem(Container cntr, string itemCode, string batchNo, float qty, string putawayNo)
+ //{
+ // var res = false;
+ // var db = new SqlHelper<object>().GetInstance();
+ // try
+ // {
+ // db.BeginTran();
+ // //1.鏌ョ湅鏄惁鏈夌浉鍚岀墿鏂欐壒娆＄殑淇℃伅锛屽鏋滄湁瑕佺疮鍔狅紝涓嶅悓鎵规鐨勫彲浠ュ垎寮�+ // var cir = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE == cntr.S_CODE && a.S_ITEM_CODE == itemCode && a.S_BATCH_NO == batchNo).First();
+ // if (cir != null)
+ // {
+ // cir.F_QTY += qty;
+ // db.Updateable(cir).UpdateColumns(it => new { it.F_QTY,it.S_CK }).ExecuteCommand();
+ // }
+ // else
+ // {
+ // //2.鎻掑叆鏂扮殑瀹瑰櫒鐗╂枡淇℃伅锛堝鍣ㄥ彿涓嶅彉锛�+ // cir = new CntrItemDetail { S_CNTR_CODE = cntr.S_CODE.Trim(), S_BATCH_NO = batchNo, F_QTY = qty, S_ITEM_CODE = itemCode, S_PUTAWAY_NO = putawayNo};
+ // db.Insertable<CntrItemDetail>(cir).ExecuteCommand();
+ // }
+ // var count = db.Queryable<CntrItemDetail>().Count(a => a.S_CNTR_CODE == cntr.S_CODE);
+ // cntr.N_DETAIL_COUNT = count;
+ // cntr.C_ENABLE = "N";//鐮佺洏鍚庡皢鎵樼洏璁剧疆涓轰笉鍙敤鐘舵�锛屽叆搴撳悗鍙樻垚鍙敤
+ // //db.Updateable(cntr).UpdateColumns(it => new { it.N_DETAIL_COUNT, it.C_ENABLE, it.S_SRC }).ExecuteCommand();
+ // db.Updateable(cntr).UpdateColumns(it => new { it.N_DETAIL_COUNT, it.C_ENABLE }).ExecuteCommand();
- db.CommitTran();
- res = true;
- }
- catch (Exception ex)
- {
- db.RollbackTran();
- Console.WriteLine(ex.Message);
- }
+ // db.CommitTran();
+ // res = true;
+ // }
+ // catch (Exception ex)
+ // {
+ // db.RollbackTran();
+ // Console.WriteLine(ex.Message);
+ // }
- return res;
- }
+ // return res;
+ //}
///// <summary>
///// 鐗╂枡淇℃伅缁戝畾鍒版弧瀹瑰櫒涓�@@ -559,16 +559,16 @@
if (db.Queryable<LocCntrRel>().Count(a => a.S_CNTR_CODE.Trim() == cntrCode) == 0)
{
var cir = new LocCntrRel { S_LOC_CODE = loc, S_CNTR_CODE = cntrCode};
- var con = new Container { S_CODE = cntrCode,N_DETAIL_COUNT = 1,C_FULL="0" };
+ var con = new Container { S_CODE = cntrCode,N_DETAIL_COUNT = 1,C_FULL="2" };//榛樿婊�涓诲姩缁戝畾鏈嶅姟鐢� db.Insertable<LocCntrRel>(cir).ExecuteCommand();
db.Insertable<Container>(con).ExecuteCommand();
if (!string.IsNullOrEmpty(itemCode))
{
LogHelper.Info($"缁戝畾瀹瑰櫒鍙傛暟锛歿JsonConvert.SerializeObject(con)}");
ContainerHelper.BindCntrItem(cntrCode, itemCode, itemName);
- //鏈夌墿鏂欑殑璇濆氨鏄弧鐨�- con.C_FULL = "2";
- db.Updateable(con).UpdateColumns(it => it.C_FULL).ExecuteCommand();
+ ////鏈夌墿鏂欑殑璇濆氨鏄弧鐨�+ //con.C_FULL = "2";
+ //db.Updateable(con).UpdateColumns(it => it.C_FULL).ExecuteCommand();
}
}
}
@@ -621,6 +621,7 @@
var db = new SqlHelper<object>().GetInstance();
try
{
+ LogHelper.Info($"BindCntrItem=============");
db.BeginTran();
var cir = new CntrItemDetail { S_CNTR_CODE = trayCode, S_ITEM_CODE = itemCode, S_ITEM_NAME = itemName};
db.Insertable<CntrItemDetail>(cir).ExecuteCommand();
@@ -630,6 +631,7 @@
}
catch (Exception ex)
{
+ LogHelper.Error("BindCntrItem:" + ex.Message, ex);
db.Ado.RollbackTran();
}
return res;
--
Gitblit v1.9.1