From d07f25c163706ac46a83bd2c63db1e3c52715222 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期四, 27 三月 2025 15:54:25 +0800
Subject: [PATCH] 解决问题

---
 Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs |  226 +++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 167 insertions(+), 59 deletions(-)

diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index de6e0ad..a60b419 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -16,6 +16,9 @@
 using WMS.Entity.SysEntity;
 using WMS.IBLL.IBllAsnServer;
 using ZXing;
+using Model.ModelDto.BllCheckDto;
+using WMS.Entity.BllCheckEntity;
+using System.Data.SqlTypes;
 
 namespace WMS.BLL.BllAsnServer
 {
@@ -297,6 +300,7 @@
                         CreateTime = a.CreateTime,
                         UpdateTime = a.UpdateTime
                     })
+                    .OrderByDescending(a=>a.BoxNo)
                     .OrderByDescending(a => a.CreateTime)
                     .ToOffsetPage(model.Page, model.Limit, ref total);
                 count = total;
@@ -423,7 +427,9 @@
                 var data = GetAllWhereAsync(item)
                     .LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
                     .LeftJoin<SysUserInfor>((a, b, c) => a.UpdateUser == c.Id)
-                    .Select((a, b, c) => new BoxInfoDto()
+                    .LeftJoin<SysMaterials>((a, b, c,d) => a.SkuNo == d.SkuNo)
+                    .LeftJoin<SysUnit>((a, b, c, d,e) => d.UnitNo == e.UnitNo)
+                    .Select((a, b, c,d,e) => new BoxInfoDto()
                     {
                         Id = a.Id,
                         ASNNo = a.ASNNo,
@@ -441,6 +447,8 @@
 
                         LotNo = a.LotNo,
                         LotText = a.LotText,
+
+                        unit =  e.UnitName,
                         
                         Status = a.Status,
                         SupplierLot = a.SupplierLot,
@@ -464,7 +472,7 @@
                         CreateTime = a.CreateTime,
                         UpdateTime = a.UpdateTime
 
-                    }).OrderByDescending(a => a.CreateTime).OrderBy(a => a.BoxNo).ToOffsetPage(model.Page, model.Limit, ref total);
+                    }).OrderBy(a => a.BoxNo).OrderByDescending(a => a.CreateTime).ToOffsetPage(model.Page, model.Limit, ref total);
                 count = total;
                 return data;
             }
@@ -521,6 +529,7 @@
                 data.Standard = asnDetail.Standard;
                 data.SupplierLot = asnDetail.SupplierLot;
                 data.PackageStandard = str;
+                data.SupplierLot = asnDetail.SupplierLot;
                 return data;
             }
             catch (Exception e)
@@ -571,10 +580,10 @@
                 {
                     throw new Exception("鏈煡璇㈠埌鍗曟嵁鏄庣粏淇℃伅");
                 }
-                if (asnList.LotNo.Length != 10)
-                {
-                    throw new Exception("鍗曟嵁杩涘巶缂栧彿浣嶆暟闀垮害閿欒");
-                }
+                //if (asnList.LotNo.Length != 10 && asnList.LotNo.Length != 11 && asnList.LotNo.Length != 12)
+                //{
+                //    throw new Exception("鍗曟嵁杩涘巶缂栧彿浣嶆暟闀垮害閿欒");
+                //}
                 var asn = Db.Queryable<BllArrivalNotice>().First(m => m.ASNNo == asnList.ASNNo && m.IsDel == "0");
                 if (asn == null)
                 {
@@ -710,18 +719,18 @@
                         }
                         else
                         {
-                            var labelCount = label.Where(m => m.ASNDetailNo == imId).ToList();
-                            if (labelCount.Count <= 0)
-                            {
-                                throw new Exception("褰撳墠鍗曟嵁鏄庣粏杩樻湭鐢熸垚鏍囩锛岃閫夋嫨閲嶇疆鎵规閫夐」涓衡�樻槸鈥欙紱");
-                            }
+                            //var labelCount = label.Where(m => m.ASNDetailNo == imId).ToList();
+                            //if (labelCount.Count <= 0)
+                            //{
+                            //    throw new Exception("褰撳墠鍗曟嵁鏄庣粏杩樻湭鐢熸垚鏍囩锛岃閫夋嫨閲嶇疆鎵规閫夐」涓衡�樻槸鈥欙紱");
+                            //}
                             //maxLotNoStr = labelCount.Max(a => a.LotNo);
                             maxLotNoStr = asnList.LotNo;
                             //if (string.IsNullOrWhiteSpace(maxLotNoStr))
                             //{
                             //    maxLotNoStr = toDayTime.Substring(2, 6) + "0001";
                             //}
-                            //maxBoxCode = label.Where(m => m.LotNo == maxLotNoStr).Max(a => a.BoxNo);
+                            maxBoxCode = label.Where(m => m.LotNo == maxLotNoStr).Max(a => a.BoxNo);
                         }
                         
                     }
@@ -738,7 +747,7 @@
                             var timeStr = toDayTime.Substring(2, 6);
                             if (lotStr == timeStr)
                             {
-                                maxLotNoStr = toDayTime.Substring(2, 6) + (int.Parse(maxCode.Substring(6, 4)) + 1).ToString().PadLeft(4, '0');
+                                maxLotNoStr = toDayTime.Substring(2, 6) + (int.Parse(maxCode.Substring(maxCode.Length - 4, 4)) + 1).ToString().PadLeft(4, '0');
                             }
                             else
                             {
@@ -782,7 +791,7 @@
                         }
                         else
                         {
-                            maxBoxCode = maxBoxCode.Substring(0, 11) + (int.Parse(maxBoxCode.Substring(11, 6)) + 1).ToString().PadLeft(6, '0'); 
+                            maxBoxCode = maxBoxCode.Substring(0, maxBoxCode.Length - 6) + (int.Parse(maxBoxCode.Substring(maxBoxCode.Length - 6, 6)) + 1).ToString().PadLeft(6, '0'); 
                         } 
                         
                         // 灏嗘潯鐮佷繚瀛樺埌鍘熸枡鏉$爜琛�
@@ -816,6 +825,7 @@
                         }
                         if (bl3)
                         {
+                            labelModel.ExpirationTime = stoTime;
                             labelModel.StoreTime = stoTime;
                         }
                         Db.Insertable(labelModel).ExecuteCommand();
@@ -881,11 +891,11 @@
                         }
                         else
                         {
-                            var labelCount = label.Where(m => m.ASNDetailNo == imId).ToList();
-                            if (labelCount.Count <= 0)
-                            {
-                                throw new Exception("褰撳墠鍗曟嵁鏄庣粏杩樻湭鐢熸垚鏍囩锛岃閫夋嫨閲嶇疆鎵规閫夐」涓衡�樻槸鈥欙紱");
-                            }
+                            //var labelCount = label.Where(m => m.ASNDetailNo == imId).ToList();
+                            //if (labelCount.Count <= 0)
+                            //{
+                            //    throw new Exception("褰撳墠鍗曟嵁鏄庣粏杩樻湭鐢熸垚鏍囩锛岃閫夋嫨閲嶇疆鎵规閫夐」涓衡�樻槸鈥欙紱");
+                            //}
                             //maxCodestr2 = labelCount.Max(a => a.LotNo); ;
                             maxCodestr2 = asnList.LotNo;
                             
@@ -893,8 +903,8 @@
                             //{
                             //    maxCodestr2 = toDayTime2.Substring(2, 6) + "0001";
                             //}
-                            //maxboxcode2 = label.Where(m => m.LotNo == maxCodestr2).Max(a => a.BoxNo);//绠卞彿;
-                            //maxboxcode3 = label.Where(m => m.LotNo == maxCodestr2).Max(a => a.BoxNo3);//鏀彿;
+                            maxboxcode2 = label.Where(m => m.LotNo == maxCodestr2).Max(a => a.BoxNo);//绠卞彿;
+                            maxboxcode3 = label.Where(m => m.LotNo == maxCodestr2).Max(a => a.BoxNo3);//鏀彿;
                         }
                         
                     }
@@ -955,7 +965,7 @@
                         }
                         else
                         {
-                            maxboxcode2 = maxboxcode2.Substring(0, 11) + (int.Parse(maxboxcode2.Substring(11, 6)) + 1).ToString().PadLeft(6, '0'); 
+                            maxboxcode2 = maxboxcode2.Substring(0, maxboxcode2.Length - 6) + (int.Parse(maxboxcode2.Substring(maxboxcode2.Length-6, 6)) + 1).ToString().PadLeft(6, '0'); 
                         }
                         //鑾峰彇绠卞唴鏀爣绛炬暟閲�
                         if (i == labelNum2)
@@ -999,7 +1009,7 @@
                             }
                             else
                             {
-                                maxboxcode3 = maxboxcode3.Substring(0, 11) + (int.Parse(maxboxcode3.Substring(11, 4)) + 1).ToString().PadLeft(4, '0'); 
+                                maxboxcode3 = maxboxcode3.Substring(0, maxboxcode3.Length - 4) + (int.Parse(maxboxcode3.Substring(maxboxcode3.Length - 4, 4)) + 1).ToString().PadLeft(4, '0'); 
                             }
 
                             //var ssss = d.ToString("0");
@@ -1037,6 +1047,7 @@
                             }
                             if (bl3)
                             {
+                                labelModel.ExpirationTime = stoTime;
                                 labelModel.StoreTime = stoTime;
                             }
                             Db.Insertable(labelModel).ExecuteCommand();
@@ -1086,6 +1097,8 @@
                 //List<WmsLabelPrintLog> printlog = new List<WmsLabelPrintLog>();
                 //鏍囩琛ㄦ暟鎹俊鎭�
                 var list = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.Origin == "WMS鐢熸垚").ToList();
+                
+
 
                 #region MyRegion
 
@@ -1106,6 +1119,9 @@
                             {
                                 throw new Exception($"鏈煡璇㈠埌{boxNo}淇℃伅");
                             }
+                            //鍗曚綅
+                            var sqlString = "select a.UnitName as unit from  SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + data.SkuNo + "'";
+                            var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault() ;
                             // 鐗╂枡鏉$爜淇℃伅璧嬪��
                             BoxInfoDto model = new BoxInfoDto();
                             model.SkuNo = data.SkuNo;
@@ -1119,6 +1135,7 @@
                             model.StoreTime = data.StoreTime;                     // 鍌ㄥ瓨鏈熻嚦 
 
                             model.Qty = dataList.Sum(m=>m.Qty);// 鏁伴噺
+                            model.unit = unitname.unit;
 
                             model.BoxNo = data.BoxNo;                 // 绠卞彿     
 
@@ -1161,6 +1178,9 @@
                                 {
                                     throw new Exception($"鏈煡璇㈠埌{item}淇℃伅");
                                 }
+                                //鍗曚綅
+                                var sqlString = "select a.UnitName as unit from  SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + data.SkuNo + "'";
+                                var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
                                 // 鐗╂枡鏉$爜淇℃伅璧嬪��
                                 BoxInfoDto model = new BoxInfoDto();
                                 model.SkuNo = data.SkuNo;
@@ -1174,6 +1194,7 @@
                                 model.StoreTime = data.StoreTime;                     // 鍌ㄥ瓨鏈熻嚦 
 
                                 model.Qty = data1.Sum(m => m.Qty);// 鏁伴噺
+                                model.unit = unitname.unit;
 
                                 model.BoxNo = data.BoxNo;                 // 绠卞彿     
 
@@ -1213,6 +1234,9 @@
                             {
                                 throw new Exception($"鏈煡璇㈠埌{boxNo2}淇℃伅");
                             }
+                            //鍗曚綅
+                            var sqlString = "select a.UnitName as unit from  SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + data.SkuNo + "'";
+                            var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
                             // 鐗╂枡鏉$爜淇℃伅璧嬪��
                             BoxInfoDto model = new BoxInfoDto();
                             model.SkuNo = data.SkuNo;
@@ -1226,6 +1250,7 @@
                             model.StoreTime = data.StoreTime;                     // 鍌ㄥ瓨鏈熻嚦 
 
                             model.Qty = data.Qty;// 鏁伴噺
+                            model.unit = unitname.unit;
 
                             model.BoxNo = data.BoxNo3;                 // 鏀彿     
 
@@ -1265,6 +1290,9 @@
                             var i = 0;
                             foreach (var data in data2)
                             {
+                                //鍗曚綅
+                                var sqlString = "select a.UnitName as unit from  SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + data.SkuNo + "'";
+                                var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
                                 // 鐗╂枡鏉$爜淇℃伅璧嬪��
                                 BoxInfoDto model = new BoxInfoDto();
                                 model.SkuNo = data.SkuNo;
@@ -1278,6 +1306,7 @@
                                 model.StoreTime = data.StoreTime;                     // 鍌ㄥ瓨鏈熻嚦 
 
                                 model.Qty = data.Qty;// 鏁伴噺
+                                model.unit = unitname.unit;
 
                                 model.BoxNo = data.BoxNo3;                 // 绠卞彿     
 
@@ -1329,8 +1358,10 @@
                                     {
                                         throw new Exception($"褰撳墠鏀爜涓嶆槸绠辩爜鍐�");
                                     }
-                                    
 
+                                    //鍗曚綅
+                                    var sqlString = "select a.UnitName as unit from  SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + data.SkuNo + "'";
+                                    var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
                                     // 鐗╂枡鏉$爜淇℃伅璧嬪�� 绠辩爜
                                     BoxInfoDto model1 = new BoxInfoDto();
                                     model1.SkuNo = data.SkuNo;
@@ -1343,6 +1374,7 @@
                                     model1.ExpirationTime = data.ExpirationTime;                  // 鏈夋晥鏈熻嚦
                                     model1.StoreTime = data.StoreTime;                     // 鍌ㄥ瓨鏈熻嚦 
                                     model1.Qty = dataList.Sum(m=>m.Qty);// 鏁伴噺
+                                    model1.unit = unitname.unit;
                                     model1.BoxNo = data.BoxNo;                 // 绠卞彿     
 
                                     model1.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 40, false);
@@ -1362,6 +1394,7 @@
                                     model.ExpirationTime = data.ExpirationTime;                  // 鏈夋晥鏈熻嚦
                                     model.StoreTime = data.StoreTime;                     // 鍌ㄥ瓨鏈熻嚦 
                                     model.Qty = data.Qty;// 鏁伴噺
+                                    model.unit = unitname.unit;
                                     model.BoxNo = data.BoxNo3;                 // 鏀彿     
 
                                     model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 40, false);
@@ -1397,6 +1430,9 @@
 
                                     var data = list.Where(m => m.BoxNo == boxNo);
                                     var boxData = data2.FirstOrDefault();
+                                    //鍗曚綅
+                                    var sqlString = "select a.UnitName as unit from  SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + boxData.SkuNo + "'";
+                                    var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
                                     // 鐗╂枡鏉$爜淇℃伅璧嬪��
                                     BoxInfoDto model = new BoxInfoDto();
                                     model.SkuNo = boxData.SkuNo;
@@ -1409,6 +1445,7 @@
                                     model.ExpirationTime = boxData.ExpirationTime;                  // 鏈夋晥鏈熻嚦
                                     model.StoreTime = boxData.StoreTime;                     // 鍌ㄥ瓨鏈熻嚦 
                                     model.Qty = data.Sum(m => m.Qty);     // 鏁伴噺
+                                    model.unit = unitname.unit;
                                     model.BoxNo = boxData.BoxNo;                 // 鏀彿     
 
                                     model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 40, false);
@@ -1419,6 +1456,9 @@
                                     var i = 0;
                                     foreach (var item in data2)
                                     {
+                                        //鍗曚綅
+                                        sqlString = "select a.UnitName as unit from  SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + item.SkuNo + "'";
+                                        unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
                                         // 鐗╂枡鏉$爜淇℃伅璧嬪��
                                         BoxInfoDto model1 = new BoxInfoDto();
                                         model1.SkuNo = item.SkuNo;
@@ -1431,6 +1471,7 @@
                                         model1.ExpirationTime = item.ExpirationTime;                  // 鏈夋晥鏈熻嚦
                                         model1.StoreTime = item.StoreTime;                     // 鍌ㄥ瓨鏈熻嚦 
                                         model1.Qty = item.Qty;// 鏁伴噺
+                                        model1.unit = unitname.unit;
                                         model1.BoxNo = item.BoxNo3;                 // 鏀彿     
 
                                         model.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 40, false);
@@ -1465,6 +1506,9 @@
                                 {
                                     throw new Exception($"鏈煡璇㈠埌{boxNo}绠辩爜淇℃伅");
                                 }
+                                //鍗曚綅
+                                var sqlString = "select a.UnitName as unit from  SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + boxData.SkuNo + "'";
+                                var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
                                 // 鐗╂枡鏉$爜淇℃伅璧嬪��
                                 BoxInfoDto model = new BoxInfoDto();
                                 model.SkuNo = boxData.SkuNo;
@@ -1477,6 +1521,7 @@
                                 model.ExpirationTime = boxData.ExpirationTime;                  // 鏈夋晥鏈熻嚦
                                 model.StoreTime = boxData.StoreTime;                     // 鍌ㄥ瓨鏈熻嚦 
                                 model.Qty = data.Sum(m => m.Qty);     // 鏁伴噺
+                                model.unit = unitname.unit;
                                 model.BoxNo = boxData.BoxNo;                 // 鏀彿     
 
                                 model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 40, false);
@@ -1489,6 +1534,9 @@
                                     var i = 0;
                                     foreach (var item in data)
                                     {
+                                        //鍗曚綅
+                                        sqlString = "select a.UnitName as unit from  SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + item.SkuNo + "'";
+                                        unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
                                         // 鐗╂枡鏉$爜淇℃伅璧嬪��
                                         BoxInfoDto model1 = new BoxInfoDto();
                                         model1.SkuNo = item.SkuNo;
@@ -1501,6 +1549,7 @@
                                         model1.ExpirationTime = item.ExpirationTime;                  // 鏈夋晥鏈熻嚦
                                         model1.StoreTime = item.StoreTime;                     // 鍌ㄥ瓨鏈熻嚦 
                                         model1.Qty = item.Qty;     // 鏁伴噺
+                                        model1.unit = unitname.unit;
                                         model1.BoxNo = item.BoxNo3;                 // 鏀彿     
 
                                         model1.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 40, false);
@@ -1557,6 +1606,9 @@
                                 {
                                     throw new Exception($"鏈煡璇㈠埌{demo}绠辩爜淇℃伅");
                                 }
+                                //鍗曚綅
+                                var sqlString = "select a.UnitName as unit from  SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + boxData.SkuNo + "'";
+                                var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
                                 // 鐗╂枡鏉$爜淇℃伅璧嬪��
                                 BoxInfoDto model = new BoxInfoDto();
                                 model.SkuNo = boxData.SkuNo;
@@ -1569,6 +1621,7 @@
                                 model.ExpirationTime = boxData.ExpirationTime;                  // 鏈夋晥鏈熻嚦
                                 model.StoreTime = boxData.StoreTime;                     // 鍌ㄥ瓨鏈熻嚦 
                                 model.Qty = data.Sum(m => m.Qty);     // 鏁伴噺
+                                model.unit = unitname.unit;
                                 model.BoxNo = boxData.BoxNo;                 // 鏀彿     
 
                                 model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 40, false);
@@ -1585,6 +1638,9 @@
                                 {
                                     foreach (var item in data.OrderBy(m => m.BoxNo3).ToList())
                                     {
+                                        //鍗曚綅
+                                        sqlString = "select a.UnitName as unit from  SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + item.SkuNo + "'";
+                                        unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
                                         // 鐗╂枡鏉$爜淇℃伅璧嬪��
                                         BoxInfoDto model1 = new BoxInfoDto();
                                         model1.SkuNo = item.SkuNo;
@@ -1597,6 +1653,7 @@
                                         model1.ExpirationTime = item.ExpirationTime;                  // 鏈夋晥鏈熻嚦
                                         model1.StoreTime = item.StoreTime;                     // 鍌ㄥ瓨鏈熻嚦 
                                         model1.Qty = item.Qty;// 鏁伴噺
+                                        model1.unit = unitname.unit;
                                         model1.BoxNo = item.BoxNo3;                 // 鏀彿     
 
                                         model1.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 40, false);
@@ -1629,6 +1686,8 @@
                 }
 
                 #endregion
+                 
+                
 
                 return printModelList;
             }
@@ -1698,17 +1757,17 @@
                         throw new Exception("褰撳墠鍗曟嵁鎵规鐨勬爣绛惧凡鏈夊凡浣跨敤锛屼笉鑳藉垹闄�");
                     }
 
-                    foreach (var item in asnList)
-                    {
-                        if (string.IsNullOrWhiteSpace(item.LotNo))
-                        {
-                            continue;
-                        }
+                    //foreach (var item in asnList)
+                    //{
+                    //    if (string.IsNullOrWhiteSpace(item.LotNo))
+                    //    {
+                    //        continue;
+                    //    }
 
-                        item.LotNo = "";
-                        Db.Updateable(item).ExecuteCommand();
+                    //    item.LotNo = "";
+                    //    Db.Updateable(item).ExecuteCommand();
 
-                    }
+                    //}
                     Db.Deleteable(labelList).ExecuteCommand();
                 }
                 else  //鍒犻櫎鍥哄畾鎵规鏍囩
@@ -1719,37 +1778,37 @@
                         throw new Exception("褰撳墠鍗曟嵁鎵规鐨勬爣绛惧凡鏈夊凡浣跨敤锛屼笉鑳藉垹闄�");
                     }
 
-                    foreach (var item in asnList)
-                    {
-                        if (string.IsNullOrWhiteSpace(item.LotNo) || item.LotNo!=lotNo)
-                        {
-                            continue;
-                        }
+                    //foreach (var item in asnList)
+                    //{
+                    //    if (string.IsNullOrWhiteSpace(item.LotNo) || item.LotNo!=lotNo)
+                    //    {
+                    //        continue;
+                    //    }
 
-                        var strList = item.LotNo.Split(";");
-                        var updateLotNo = "";
-                        foreach (var str in strList)
-                        {
-                            if (string.IsNullOrWhiteSpace(str) || str == lotNo)
-                            {
-                                continue;
-                            }
+                    //    var strList = item.LotNo.Split(";");
+                    //    var updateLotNo = "";
+                    //    foreach (var str in strList)
+                    //    {
+                    //        if (string.IsNullOrWhiteSpace(str) || str == lotNo)
+                    //        {
+                    //            continue;
+                    //        }
 
-                            if (string.IsNullOrWhiteSpace(updateLotNo))
-                            {
-                                updateLotNo = str;
-                            }
-                            else
-                            {
-                                updateLotNo += ";" + str;
-                            }
+                    //        if (string.IsNullOrWhiteSpace(updateLotNo))
+                    //        {
+                    //            updateLotNo = str;
+                    //        }
+                    //        else
+                    //        {
+                    //            updateLotNo += ";" + str;
+                    //        }
                              
-                        }
+                    //    }
 
-                        item.LotNo = updateLotNo;
-                        Db.Updateable(item).ExecuteCommand();
+                    //    item.LotNo = updateLotNo;
+                    //    Db.Updateable(item).ExecuteCommand();
 
-                    }
+                    //}
                     Db.Deleteable(labelList).ExecuteCommand();
                 }
 
@@ -1771,5 +1830,54 @@
             }
         }
 
+
+        //缂栬緫鏍囩鏁伴噺
+        public void EditLabelQty(int id, string qty, int userId)
+        {
+            try
+            {
+                if (string.IsNullOrWhiteSpace(qty))
+                {
+                    throw new Exception("缂栬緫鏁伴噺涓嶅彲涓虹┖");
+                }
+                var qtyData = 0m;
+                var isOk = decimal.TryParse(qty, out qtyData);
+                var boxInfo = Db.Queryable<BllBoxInfo>().First(m => m.IsDel == "0" && m.Id == id);
+                if (boxInfo == null)
+                {
+                    throw new Exception("鏈煡璇㈠埌璇ユ爣绛句俊鎭�");
+                }
+
+                if (isOk)
+                {
+                    if (qtyData <= 0)
+                    {
+                        throw new Exception("鏁伴噺涓嶈兘灏忎簬绛変簬0");
+                    }
+                    boxInfo.Qty = qtyData;
+
+                    Db.Updateable(boxInfo).ExecuteCommand();
+                }
+                else
+                {
+                    throw new Exception("鏁伴噺杞崲澶辫触");
+                }
+
+                var msg = $"缂栬緫浜嗙鍙凤細{boxInfo.BoxNo}";
+                if (!string.IsNullOrWhiteSpace(boxInfo.BoxNo3))
+                {
+                    msg += $"銆佹敮鍙凤細{boxInfo.BoxNo3}";
+                }
+                msg += "鐨勬爣绛炬暟閲忎俊鎭�";
+
+                new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鐗╂枡鏍囩", boxInfo.BoxNo, "缂栬緫", msg, userId);
+            }
+            catch (Exception e)
+            {
+                throw new Exception(e.Message);
+            }
+        }
+
+
     }
 }

--
Gitblit v1.8.0