登录页修改

IPC-610

2024-09-26 2be1922b035c182c3c516427aa68be54badd6938

 Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs

@@ -529,7 +529,7 @@
        }

        //获取标签信息(生成标签)
        public List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime, int userId)
        public List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime,string supplierLot, int userId)
        {
            try
            { 
@@ -681,12 +681,13 @@
                            {
                                throw new Exception("当前单据明细还未生成标签，请选择重置批次选项为‘是’；");
                            }
                            maxLotNoStr = label.Max(a => a.LotNo);
                            maxBoxCode = label.Max(a => a.BoxNo);
                            maxLotNoStr = labelCount.Max(a => a.LotNo);
                            
                            if (string.IsNullOrWhiteSpace(maxLotNoStr))
                            {
                                maxLotNoStr = toDayTime.Substring(2, 6) + "0001";
                            }
                            maxBoxCode = label.Where(m => m.LotNo == maxLotNoStr).Max(a => a.BoxNo);
                        }
                        
                    }
@@ -756,7 +757,7 @@
                            ASNNo = asnList.ASNNo,
                            ASNDetailNo = asnList.Id,
                            BoxNo = maxBoxCode, 
                            Qty = int.Parse(boxQty.ToString()),
                            Qty = boxQty,
                            FullQty = bNum,
                            Status = "0",
                            SkuNo = asnList.SkuNo,
@@ -764,10 +765,10 @@
                            LotNo = maxLotNoStr,
                            Standard = asnList.Standard,
                            PackageStandard = packStr,
                            SupplierLot = asnList.SupplierLot,
                            SupplierLot = supplierLot,
                            InspectMark = "0",
                            BitBoxMark = bNum > boxQty ? "1":"0",
                            InspectStatus = "",
                            InspectStatus = "0",

                            ProductionTime = DateTime.Parse(productionTime),
                            StoreTime = DateTime.Parse(storeTime),
@@ -846,13 +847,14 @@
                            {
                                throw new Exception("当前单据明细还未生成标签，请选择重置批次选项为‘是’；");
                            }
                            maxCodestr2 = label.Max(a => a.LotNo); ;
                            maxboxcode2 = label.Max(a => a.BoxNo);//箱号;
                            maxboxcode3 = label.Max(a => a.BoxNo3);//支号;
                            maxCodestr2 = labelCount.Max(a => a.LotNo); ;
                            
                            if (string.IsNullOrWhiteSpace(maxCodestr2))
                            {
                                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);//支号;
                        }
                        
                    }
@@ -960,8 +962,8 @@
                                maxboxcode3 = maxboxcode3.Substring(0, 11) + (int.Parse(maxboxcode3.Substring(11, 4)) + 1).ToString().PadLeft(4, '0'); 
                            }

                            var ssss = d.ToString("0");
                            var sss = int.Parse(ssss);
                            //var ssss = d.ToString("0");
                            //var sss = int.Parse(ssss);

                            // 将条码保存到原料条码表
                            var labelModel = new BllBoxInfo()
@@ -970,7 +972,7 @@
                                ASNDetailNo = asnList.Id,
                                BoxNo = maxboxcode2,
                                BoxNo3 = maxboxcode3,
                                Qty = sss,
                                Qty = d,
                                FullQty = bNum,
                                Status = "0",
                                SkuNo = asnList.SkuNo,
@@ -978,7 +980,7 @@
                                LotNo = maxCodestr2,
                                Standard = asnList.Standard,
                                PackageStandard = packStr,
                                SupplierLot = asnList.SupplierLot,
                                SupplierLot = supplierLot,
                                InspectMark = "0",
                                BitBoxMark = bNum > boxQty ? "1" : "0",
                                InspectStatus = "0",