chengsc
2025-02-28 f9a9a948cd138ad0877c54319857c327c0c0c402
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -657,7 +657,7 @@
                {
                    if (pack.L2Name != "托")
                    {
                        packLevel = 2;
                        packLevel = 1;//JC34项目只有一级标签
                        bNum = Convert.ToInt32(pack.L2Num);
                    }
                }
@@ -710,14 +710,14 @@
                    #endregion
                    int labelNum = 1; //生产条码数量
                    if (zNum > 0)
                    {
                        labelNum = int.Parse(Math.Ceiling(qty / zNum).ToString());//标签数量
                    }
                    else
                    {
                        throw new Exception("当前单据物料是一级包装,未查询到一级包装信息");
                    }
                    //if (zNum > 0)
                    //{
                        labelNum = int.Parse(Math.Ceiling(qty / bNum).ToString());//标签数量
                    //}
                    //else
                    //{
                    //    throw new Exception("当前单据物料是一级包装,未查询到一级包装信息");
                    //}
                    #region 获取/生成批次号
@@ -734,30 +734,30 @@
                        if (i == labelNum)
                        {
                            // 最后一个条码
                            var s = zNum * (i - 1);
                            if (zNum > qty - s)
                            var s = bNum * (i - 1);
                            if (bNum > qty - s)
                            {
                                boxQty = qty - s;// 数量
                            }
                            else
                            {
                                boxQty = zNum;// 数量
                                boxQty = bNum;// 数量
                            }
                        }
                        else
                        {
                            boxQty = zNum;         // 数量
                            boxQty = bNum;         // 数量
                        }
                        //获取箱码
                        if (string.IsNullOrWhiteSpace(maxBoxCode))
                        {
                            var str = "B" + maxLotNoStr + "000001"; //批号+ 流水  2302010001000001
                            var str = "B" + maxLotNoStr + "000001"; //批号+ 流水  B 230201 0001  000001
                            maxBoxCode = str;
                        }
                        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');
                        }
                        // 将条码保存到原料条码表