From f2bc08e28dda7022202f07217f6a3c150f818af7 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 20 一月 2025 08:32:16 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms
---
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 102 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 93 insertions(+), 9 deletions(-)
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 7af51a0..50a3dd7 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -21,6 +21,7 @@
using WMS.Entity.SysEntity;
using WMS.IBLL.IBllAsnServer;
using WMS.Entity.BllQualityEntity;
+using WMS.Entity.BllCheckEntity;
namespace WMS.BLL.BllAsnServer
{
@@ -180,6 +181,7 @@
//鍒ゆ柇鎵樼洏缁戝畾淇℃伅涓槸鍚︽湁
var bind = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.ASNDetailNo == detail.Id && m.PalletNo == model.PalletNo && m.Status != "2");
var bindId = 0;
+ var boxQtyZong = model.Detail.Sum(m => m.Qty);
if (bind == null)
{
bind = new BllPalletBind
@@ -189,7 +191,7 @@
PalletNo = model.PalletNo,
PalletNo2 = "",
PalletNo3 = "",
- Qty = model.Qty,
+ Qty = boxQtyZong,
FullQty = pNum,
Status = "0",//绛夊緟鎵ц
Type = model.Type, //鎵樼洏绫诲瀷 0鐗╂枡鎵� 1绌烘墭鐩樻墭
@@ -213,7 +215,8 @@
}
else
{
- throw new Exception("缁勭洏淇℃伅閲嶅");
+ //throw new Exception("缁勭洏淇℃伅閲嶅");
+ return;
}
@@ -316,8 +319,8 @@
Standard = box.Standard,
PackageStandard = box.PackageStandard,
StoreTime = box.StoreTime,
- QtyCount = (int)box.QtyCount,
- QtyOrd = (int)box.QtyOrd,
+ QtyCount = box.QtyCount.HasValue? (int)box.QtyCount : 0,
+ QtyOrd = box.QtyOrd.HasValue ? (int)box.QtyOrd : 0,
CreateUser = userId,
CreateTime = comTime,
};
@@ -1184,7 +1187,7 @@
EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
- TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
+ TaskType = "0",// 浠诲姟绫诲瀷 (鍏ュ簱)
OutMode = "", //鐩爣鍦板潃
Order = 1
};
@@ -1621,7 +1624,7 @@
- var areaNoStr = "A03";
+ var areaNoStr = "A07";
var allotLocate = new AllotLocation();
#region 鏍规嵁sku纭鍖哄煙鍒掑垎
@@ -1906,9 +1909,9 @@
EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
- TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
+ TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
OutMode = "", //鐩爣鍦板潃
- Order = 1
+ Order = 1
};
if (beingTask.IsSuccess == 0)
{
@@ -2294,7 +2297,7 @@
SysStorageLocat locate;
var areaList = new List<string>();
- areaList.Add("A03");
+ areaList.Add("A07");
locate = allotLocate.GetSuiTableLocate(houseNo, areaList, roadwayNo);
Db.BeginTran();
@@ -3185,6 +3188,87 @@
}
+ //鐢宠缂犺啘鍏ュ簱
+ public int RequestPackWcs(string palletNo)
+ {
+ try
+ {
+ int t = -1;
+ //楠岃瘉鎵樼洏鏉＄爜鏄惁涓虹┖
+ if (string.IsNullOrEmpty(palletNo))
+ {
+ throw new Exception("鏈壘鍒拌鎵樼洏鏉＄爜锛�"+ palletNo);
+ }
+ var palletBindList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && m.Status == "1").OrderByDescending(m=>m.CreateTime).First();
+ if (palletBindList.IsBale == "1")
+ {
+ t = 1;
+ }
+ return t;
+
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+
+ }
+ }
+
+ //鐢宠鎷嗚啘鍑哄簱
+ public int RequestUnPackWcs(string palletNo)
+ {
+ try
+ {
+ int t = -1;
+ //楠岃瘉鎵樼洏鏉＄爜鏄惁涓虹┖
+ if (string.IsNullOrEmpty(palletNo))
+ {
+ throw new Exception("鏈壘鍒拌鎵樼洏鏉＄爜锛�" + palletNo);
+ }
+ var palletBindList = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && m.LocatNo.Substring(0,1) != "B").First();
+ if (palletBindList.IsBale == "2")
+ {
+ palletBindList.IsBale = "0";
+ Db.Updateable(palletBindList).ExecuteCommand();
+ t = 1;
+ }
+
+ return t;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+
+ }
+ }
+
+ //缂犺啘瀹屾垚
+ public int RequestPackedWcs(string palletNo)
+ {
+ try
+ {
+ int t = -1;
+ //楠岃瘉鎵樼洏鏉＄爜鏄惁涓虹┖
+ if (string.IsNullOrEmpty(palletNo))
+ {
+ throw new Exception("鏈壘鍒拌鎵樼洏鏉＄爜锛�" + palletNo);
+ }
+ var palletBindList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && m.Status == "1").OrderByDescending(m => m.CreateTime).First();
+ if (palletBindList.IsBale == "1")
+ {
+ palletBindList.IsBale = "2";
+ Db.Updateable(palletBindList).ExecuteCommand();
+ t = 1;
+ }
+
+ return t;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+
+ }
+ }
////閲嶆柊涓嬪彂鍏ュ簱浠诲姟
//public OutCommandDto AgainSendAsnTask(string taskNo, int userId, string url)
--
Gitblit v1.8.0