From deb9ab689bdeeb20ad2f835f9c13aba6f39652cb Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 02 二月 2024 11:41:13 +0800
Subject: [PATCH] 合并代码
---
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 26 +-------------------------
1 files changed, 1 insertions(+), 25 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 385819f..05d0bac 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -1908,7 +1908,6 @@
#region 绠辩爜淇℃伅
var boxInfoList = new List<BllLabelBoxNo>();
var msgStr = $"绠卞彿涓簕model.BoxNo}";
- var boxInfoList = new List<BllLabelBoxNo>();
//棣栫
var boxInfo = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo && m.Level == "1").ToList();
if (boxInfo.Count == 0)
@@ -1928,30 +1927,7 @@
boxInfoList.AddRange(boxInfo2);
var sql = $"select * from BllLabelBoxNo where IsDel = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}' and Level='1'; ";
var list = Db.Ado.SqlQuery<BllLabelBoxNo>(sql);
- boxInfoList.AddRange(list);
- decimal factQty = 0.00m;//鎵樼洏鎬绘暟閲�
- if (model.SkuQty == 0)
- {
- //棣栫
- var boxInfo = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo && m.IsUse == "0" && m.Level == "1").ToList();
- if (boxInfo.Count == 0)
- {
- throw new Exception("-1:绠辩爜淇℃伅涓嶅瓨鍦�!");
- }
- //鏄惁杩炵画缁勬墭
- if (model.IsContinue == "1")
- {
- boxInfoList.AddRange(boxInfo);
- //灏剧
- var boxInfo2 = Db.Queryable<BllLabelBoxNo>().Where(m => m.IsDel == "0" && m.BoxNo == model.TailBoxNo && m.IsUse == "0" && m.Level == "1").ToList();
- if (boxInfo2.Count == 0)
- {
- throw new Exception("-1:灏剧鐮佷俊鎭笉瀛樺湪!");
- }
- boxInfoList.AddRange(boxInfo2);
- var sql = $"select * from BllLabelBoxNo where IsDel = '0' and IsUse = '0' and boxNo>'{model.BoxNo}' and boxNo<'{model.TailBoxNo}' and Level='1'; ";
- var list = Db.Ado.SqlQuery<BllLabelBoxNo>(sql);
- boxInfoList.AddRange(list);
+ boxInfoList.AddRange(list);
//鎵惧埌鐩稿叧鐨勪簩绾х爜
foreach (var item in boxInfoList)
--
Gitblit v1.8.0