JC34WMS.git - Gitblit

			@@ -22,6 +22,13 @@
			using System.Xml.Schema;
			using ZXing.OneD;
			using System.Threading.Tasks;
			using System.Security.Policy;
			using Newtonsoft.Json;
			using Utility.Tools;
			using Model.ModelDto.SysDto;
			using Model.ModelVm.SysVm;
			using System.Security.Cryptography.X509Certificates;
			using AutoMapper.Configuration.Annotations;

			namespace WMS.BLL.BllPdaServer
			{
			@@ -1720,7 +1727,7 @@
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model)
			public List<BoxInfoDto> GetBindBoxInfos(BoxInfoVm model,string url)
			{
			try
			{
			@@ -1728,27 +1735,307 @@
			{
			throw new Exception("请扫描外箱条码!");
			}
			string sqlString = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);

			if (models.Count == 0)
			if (string.IsNullOrWhiteSpace(model.ASNNo))
			{
			throw new Exception("箱码信息不存在!");
			throw new Exception("请选择入库单号!");
			}
			var noticeList = Db.Queryable<BllArrivalNotice>().Where(m => m.IsDel == "0" && m.ASNNo == model.ASNNo).ToList();
			if (noticeList.Count != 1)
			{
			throw new Exception("入库单号重复!");
			}
			var notice = noticeList.First();
			if (notice.Type == "0") //成品入库
			{
			string sqlString = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);

			return models;
			if (models.Count != 0)
			{
			return models;
			}
			else
			{
			var boxInfo = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo).ToList();

			if (boxInfo.Count == 0)
			{
			models = GetFMBindBoxInfos(model.BoxNo, url);
			return models;
			}
			else
			{
			if (boxInfo.Count(m => m.Status != "0") > 0)
			{
			throw new Exception("箱码信息状态不是等待执行");
			}
			return models;
			}



			}
			}
			else if (notice.Type == "1" \|\| notice.Type == "4") //采购入库
			{
			string sqlString = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);

			if (models.Count != 0)
			{
			return models;
			}
			else
			{
			throw new Exception("没有查询到箱码信息");
			}
			}
			else if (notice.Type == "3") //退货入库
			{
			string sqlString = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			var models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);

			if (models.Count != 0)
			{
			return models;
			}
			else
			{
			sqlString = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo2 = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);
			if (models.Count != 0)
			{
			return models;
			}
			else
			{
			sqlString = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo3 = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			models = Db.Ado.SqlQuery<BoxInfoDto>(sqlString);
			if (models.Count != 0)
			{
			return models;
			}
			}
			}

			#region 获取最后一次出库拣货中的箱码信息

			var comBox = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.BoxNo == model.BoxNo).GroupBy(m => m.ExportAllotId).Select(m => m.ExportAllotId).ToList();
			if (comBox.Count == 0)
			{
			comBox = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.BoxNo2 == model.BoxNo).GroupBy(m => m.ExportAllotId).Select(m => m.ExportAllotId).ToList();
			if (comBox.Count == 0)
			{
			comBox = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.BoxNo3 == model.BoxNo).GroupBy(m => m.ExportAllotId).Select(m => m.ExportAllotId).ToList();
			}
			}
			var i = 0;//循环次数
			DateTime time = DateTime.Now;
			var allotId = 0;
			foreach (var item in comBox)
			{
			var comBoxList = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == item).OrderByDescending(m => m.CreateTime).First();
			if (i == 0)
			{
			time = comBoxList.CreateTime;
			allotId = comBoxList.ExportAllotId;
			}
			else if (comBoxList.CreateTime > time)
			{
			time = comBoxList.CreateTime;
			allotId = comBoxList.ExportAllotId;
			}
			i++;
			}
			if (allotId != 0)
			{
			var addComBox = Db.Queryable<BllCompleteDetail>().Where(m => m.IsDel == "0" && m.ExportAllotId == allotId).ToList();
			var addComList = addComBox.GroupBy(m => m.BoxNo).ToList();
			var sku = Db.Queryable<SysMaterials>().First(m => m.SkuNo == addComBox.First().SkuNo);
			var pNum = 0;
			var bNum = 0;
			new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
			var boxList = new List<BllBoxInfo>();
			foreach (var com in addComList)
			{
			//箱内总数和
			var qtySum = addComBox.Where(m => m.BoxNo == com.Key).Sum(m => m.CompleteQty);
			var bitBox = "1";
			if (qtySum == bNum)
			{
			bitBox = "0";
			}
			foreach (var item in com)
			{
			if (item.BoxNo != model.BoxNo)
			{
			if (item.BoxNo2 != model.BoxNo)
			{
			if (item.BoxNo3 != model.BoxNo)
			{
			continue;
			}
			}
			}
			var boxInfo = new BllBoxInfo()
			{
			BoxNo = item.BoxNo,
			BoxNo2 = item.BoxNo2,
			BoxNo3 = item.BoxNo3,
			SkuNo = item.SkuNo,
			SkuName = item.SkuName,
			LotNo = item.LotNo,
			LotText = item.LotText,
			Qty = (decimal)item.CompleteQty,
			FullQty = bNum,
			//ProductionTime = ,
			//ExpirationTime = ,
			InspectMark = "0",
			InspectStatus = "0",
			BitBoxMark = bitBox,
			Origin = "WMS",
			Status = "0",
			CreateUser = 0
			};
			boxList.Add(boxInfo);
			}

			}
			Db.Insertable(boxList).ExecuteCommand();

			string sqlString2 = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			var models2 = Db.Ado.SqlQuery<BoxInfoDto>(sqlString2);

			if (models2.Count != 0)
			{
			return models2;
			}
			else
			{
			sqlString2 = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo2 = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			models2 = Db.Ado.SqlQuery<BoxInfoDto>(sqlString2);
			if (models2.Count != 0)
			{
			return models2;
			}
			else
			{
			sqlString2 = $@"SELECT
			ASNNo,
			BoxNo,
			SkuNo,
			SkuName,
			LotNo,
			BitBoxMark,
			SUM(Qty) as Qty
			FROM BllBoxInfo
			WHERE IsDel = '0'
			AND Status='0'
			AND BoxNo3 = '{model.BoxNo}'
			GROUP BY ASNNo,BoxNo,SkuNo,SkuName,LotNo,BitBoxMark; ";
			models2 = Db.Ado.SqlQuery<BoxInfoDto>(sqlString2);
			if (models2.Count != 0)
			{
			return models2;
			}
			}
			}


			}

			throw new Exception("箱码信息不存在!");
			#endregion

			}
			else
			{
			throw new Exception("单据类型错误");
			}
			}
			catch (Exception ex)
			{
			@@ -1761,21 +2048,83 @@
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			public List<BoxInfoDto> GetFMBindBoxInfos(string boxno)
			public List<BoxInfoDto> GetFMBindBoxInfos(string boxno,string url)
			{
			try
			{
			#region 箱码请求接口，正式系统放开
			/*var jsonData = JsonConvert.SerializeObject(boxno);
			var data = new
			{
			BoxCode = boxno
			};
			var jsonData = JsonConvert.SerializeObject(data);

			var response = HttpHelper.DoPost(url, jsonData, "箱码信息请求", "FM");

			var obj = JsonConvert.DeserializeObject<ErpModel>(response);//解析返回数据
			if (obj.Success != 0)
			var obj = JsonConvert.DeserializeObject<FumaGetBoxModel>(response);//解析返回数据
			if (obj.Success != "0")
			{
			throw new Exception("请求失败" + obj.Message);
			}*/
			}
			#endregion
			var sku = Db.Queryable<SysMaterials>().First(m => m.SkuNo == obj.Product.SkuNo);
			var pNum = 0;//托盘物品数量
			var bNum = 0;//箱码物品数量
			if (sku == null)
			{
			throw new Exception($"未查询到物料{obj.Product.SkuNo}信息");
			}
			new Common().GetPackQtyInfo(sku.PackagNo, ref pNum, ref bNum);
			if (pNum == 0 \|\| bNum == 0)
			{
			throw new Exception($"{sku.SkuNo}物品包装未找到！");
			}

			var boxList = new List<BllBoxInfo>();
			var comTime = DateTime.Now;
			//添加箱码信息
			foreach (var box in obj.Product.BoxInfoList)
			{
			foreach (var box2 in box.BoxInfo2List)
			{
			foreach (var box3 in box2.BoxInfo3List)
			{
			var boxInfo = new BllBoxInfo()
			{
			BoxNo = box.BoxNo,
			BoxNo2 = box2.BoxNo2,
			BoxNo3 = box3.BoxNo3,
			Qty = box3.Qty,
			BitBoxMark = box.BitBoxMark,

			ASNNo = "",
			//ASNDetailNo = noticeDetail.Id,
			OrderCode = "",//notice.OrderCode
			//BindNo = bindId,
			//PalletNo = model.PallNo,
			FullQty = bNum,
			Status = "2",
			SkuNo = sku.SkuNo,
			SkuName = sku.SkuName,
			LotNo = obj.Product.LotNo,
			LotText = obj.Product.LotText,
			ProductionTime = DateTime.Parse(obj.Product.ProductionTime),
			ExpirationTime = DateTime.Parse(obj.Product.ExpirationTime),
			//CompleteTime = "",
			InspectMark = "0",
			InspectStatus = "0",
			Origin = "赋码",
			CreateTime = comTime,
			CreateUser = 0
			};
			boxList.Add(boxInfo);
			}

			}
			}
			Db.Fastest<BllBoxInfo>().BulkCopy(boxList);


			string sqlString = $@"SELECT
			ASNNo,
			BoxNo,
			@@ -2065,13 +2414,6 @@
			}

			#endregion







			// 获取单据列表
			public List<ArrivalNoticeDto> GetArrivalNotices(ArrivalNoticeVm model)
			{
			@@ -2106,11 +2448,6 @@
			throw ex;
			}
			}






			// 根据箱码或托盘号获取箱支信息 liudl
			public List<BoxInfoDto> GetBoxInfos(BoxInfoVm model)
			@@ -5606,16 +5943,7 @@
			//修改库存明细信息
			Db.Updateable(item).ExecuteCommand();
			}
			//获取拣货信息
			var alotr = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.PalletNo == model.PalletNo && a.Status == "4");
			if (alotr != null)
			{
			alotr.Status = "5"; //5 已完成
			alotr.UpdateUser = model.CreateUser; //修改人
			alotr.UpdateTime = serverTime; //修改时间
			//修改拣货信息
			Db.Updateable(alotr).ExecuteCommand();
			}

			#region 任务及组托信息
			//创建任务信息
			var taskNo = new Common().GetMaxNo("TK");
			@@ -5660,15 +5988,15 @@
			var upShelf = new BllPalletUpShelf()
			{
			TaskNo = exTask.TaskNo,
			TraceNo = bindInfo.ASNNo,
			PalletNo = bindInfo.PalletNo,
			TraceNo = bindInfo== null? "": bindInfo.ASNNo,
			PalletNo = model.PalletNo,
			SkuNo = palletupinfo.SkuNo,
			SkuName = palletupinfo.SkuName,
			LotNo = palletupinfo.LotNo,
			Status = "2",
			LocatNo = model.LocatNo,
			WareHouseNo = bindInfo.WareHouseNo,
			RoadwayNo = bindInfo.RoadwayNo,
			WareHouseNo = storageLocat.WareHouseNo,
			RoadwayNo = storageLocat.RoadwayNo,
			AreaNo = storageLocat.AreaNo,

			CreateUser = 0,
			@@ -6018,5 +6346,359 @@

			#endregion

			#region 线边标签
			/// <summary>
			/// 根据物料编码、名称获取物料信息
			/// </summary>
			/// <param name="model">编码名称</param>
			/// <returns>物料详细信息</returns>
			public MaterialsDto GetSkuInfo(GetMaterialsVm model)
			{
			try
			{
			if (string.IsNullOrEmpty(model.SkuNo) && string.IsNullOrEmpty(model.SkuName))
			{
			throw new Exception("请输入物料编码或物料名称!");
			}

			var skuModels = Db.Queryable<SysMaterials>().Where(m => (m.SkuNo == model.SkuNo \|\| m.SkuName == model.SkuName) && m.IsDel == "0").Select< MaterialsDto>().ToList();
			if (skuModels.Count <= 0)
			{
			throw new Exception("物料不存在！");
			}

			return skuModels.First();
			}
			catch (Exception ex)
			{
			throw ex;
			}
			}

			/// <summary>
			/// 生成条码标签
			/// </summary>
			/// <param name="model"></param>
			/// <returns></returns>
			/// <exception cref="Exception"></exception>
			public List<BllBoxInfo> AddLabels(LabelsVm model)
			{
			try
			{
			if (decimal.TryParse(model.SkuNum, out decimal skuQty))
			{
			if (skuQty <= 0)
			{
			throw new Exception("箱内数量不能小于等于0");
			}
			}
			else
			{
			throw new Exception("箱内数量请输入数字！");
			}

			// 验证物料信息是否存在
			var skuModels = Db.Queryable<SysMaterials>().Where(m => (m.SkuNo == model.SkuNo \|\| m.SkuName == model.SkuName) && m.IsDel == "0").Select<MaterialsDto>().ToList();
			if (skuModels.Count <= 0)
			{
			throw new Exception("物料不存在！");
			}


			#region
			var skuModel = skuModels.First();
			var pack = Db.Queryable<SysPackag>().First(m => m.IsDel == "0" && m.PackagNo == skuModel.PackagNo);
			if (pack == null)
			{
			throw new Exception("未查询到当前物料的包装信息");
			}

			var packStr = "";
			if (!string.IsNullOrWhiteSpace(pack.L1Name))
			{
			packStr += pack.L1Num + "/" + pack.L1Name;
			}
			if (!string.IsNullOrWhiteSpace(pack.L2Name))
			{
			packStr += "-" + pack.L2Num + "/" + pack.L2Name;
			}
			if (!string.IsNullOrWhiteSpace(pack.L3Name))
			{
			packStr += "-" + pack.L3Num + "/" + pack.L3Name;
			}
			if (!string.IsNullOrWhiteSpace(pack.L4Name))
			{
			packStr += "-" + pack.L4Num + "/" + pack.L4Name;
			}
			if (!string.IsNullOrWhiteSpace(pack.L5Name))
			{
			packStr += "-" + pack.L5Num + "/" + pack.L5Name;
			}
			#endregion

			#region 包装查询

			var bNum = 0;//箱物品数量
			var zNum = 0;//支物品数量
			var packLevel = 0;

			if (pack.L2Num.HasValue)
			{
			if (pack.L2Name != "托")
			{
			packLevel = 1;//JC34项目只有一级标签
			bNum = Convert.ToInt32(pack.L2Num);
			}
			}
			if (pack.L1Num.HasValue)
			{
			if (packLevel == 0)
			{
			packLevel = 1;
			bNum = Convert.ToInt32(pack.L1Num);
			}
			zNum = Convert.ToInt32(pack.L1Num);
			}

			if (packLevel < 1)//包装等级小于1，按照1级标签打印
			{
			throw new Exception("包装信息有误，小于一级");
			}

			if (skuQty > bNum * 5)
			{
			throw new Exception("箱内数量大于包装5倍，不可打印");
			}
			#endregion
			var modelList = new List<BllBoxInfo>();
			var label = Db.Queryable<BllBoxInfo>().Where(m => m.LotNo == model.LotNo && m.SkuNo == model.SkuNo && m.IsDel == "0").ToList();

			Db.BeginTran();
			if (packLevel == 1)
			{
			#region 一级包装
			int labelNum = 1;
			labelNum = int.Parse(Math.Ceiling(skuQty / bNum).ToString());//标签数量


			#region 获取/生成批次号
			string maxLotNoStr = ""; //批次号
			string maxBoxCode = ""; //箱码号

			maxLotNoStr = model.LotNo;
			maxBoxCode = label.Where(m => m.LotNo == maxLotNoStr).Max(a => a.BoxNo);
			#endregion

			for (int i = 1; i <= labelNum; i++)
			{
			decimal boxQty = 0;
			if (i == labelNum)
			{
			// 最后一个条码
			var s = bNum * (i - 1);
			if (bNum > skuQty - s)
			{
			boxQty = skuQty - s;// 数量
			}
			else
			{
			boxQty = bNum;// 数量
			}
			}
			else
			{
			boxQty = bNum; // 数量
			}

			//获取箱码
			if (string.IsNullOrWhiteSpace(maxBoxCode))
			{
			var str = "B" + maxLotNoStr + "000001"; //批号+ 流水 B 230201 0001 000001
			maxBoxCode = str;
			}
			else
			{
			maxBoxCode = maxBoxCode.Substring(0, maxBoxCode.Length - 6) + (int.Parse(maxBoxCode.Substring(maxBoxCode.Length - 6, 6)) + 1).ToString().PadLeft(6, '0');
			}

			// 将条码保存到原料条码表
			var labelModel = new BllBoxInfo()
			{
			BoxNo = maxBoxCode,
			Qty = boxQty,
			FullQty = bNum,
			Status = "0",
			SkuNo = model.SkuNo,
			SkuName = model.SkuName,
			LotNo = maxLotNoStr,
			Standard = skuModel.Standard,
			PackageStandard = packStr,
			InspectMark = "0",
			BitBoxMark = bNum > boxQty ? "1" : "0",
			InspectStatus = "0",

			ProductionTime = DateTime.Parse(model.TimeFrom),
			StoreTime = DateTime.Parse(model.TimeEnd),
			ExpirationTime = DateTime.Parse(model.TimeEnd),

			Origin = "WMS生成",
			CreateUser = (int)model.userId,
			CreateTime = DateTime.Now,
			};

			Db.Insertable(labelModel).ExecuteCommand();
			modelList.Add(labelModel);
			}

			#endregion
			}
			else //(packLevel == 2)
			{
			#region 二级包装

			if (skuQty > bNum * 5)
			{
			throw new Exception("箱内数量大于包装5倍，不可打印");
			}

			var qty2 = skuQty;
			int labelNum2 = 1; //生产箱条码数量

			labelNum2 = int.Parse(Math.Ceiling(qty2 / bNum).ToString());

			var ss = bNum / zNum; //每箱支标签数量
			var labelNumZ2 = Math.Ceiling((decimal)ss);

			#region 获取/生成批次号

			string maxCodestr2 = ""; //批次
			string maxboxcode2 = ""; //箱码
			string maxboxcode3 = ""; //支码

			maxCodestr2 = model.LotNo;
			maxboxcode2 = label.Where(m => m.LotNo == maxCodestr2).Max(a => a.BoxNo);
			maxboxcode3 = label.Where(m => m.LotNo == maxCodestr2).Max(a => a.BoxNo3);//支号
			#endregion

			for (int i = 1; i <= labelNum2; i++)//箱码标签
			{
			//箱内数量
			decimal boxQty = 0;
			if (i == labelNum2)
			{
			// 最后一个条码
			var s = bNum * (i - 1);
			if (bNum > qty2 - s)
			{
			boxQty = qty2 - s;// 数量
			}
			else
			{
			boxQty = bNum;// 数量
			}
			}
			else
			{
			boxQty = bNum; // 数量
			}

			//获取箱码
			if (string.IsNullOrWhiteSpace(maxboxcode2))
			{
			maxboxcode2 = "B" + maxCodestr2 + "000001"; // 箱号批号+第几箱
			}
			else
			{
			maxboxcode2 = maxboxcode2.Substring(0, 11) + (int.Parse(maxboxcode2.Substring(11, 6)) + 1).ToString().PadLeft(6, '0');
			}
			//获取箱内支标签数量
			if (i == labelNum2)
			{
			var isGo2 = false;
			var sl = 0;
			for (int j = 1; j <= labelNumZ2; j++)
			{
			if (isGo2)
			{
			break;
			}
			var s = bNum * (i - 1);
			var s2 = zNum * (j - 1);
			if (zNum >= qty2 - s - s2)
			{
			isGo2 = true;
			}
			sl++;
			}
			labelNumZ2 = sl;
			}

			for (int j = 1; j <= labelNumZ2; j++)//最小单位标签
			{

			decimal d = zNum;
			if (i == labelNum2)
			{
			var s = bNum * (i - 1);
			var s2 = zNum * (j - 1);
			if (zNum >= qty2 - s - s2)
			{
			d = qty2 - s - s2; // 数量
			}
			}

			if (string.IsNullOrWhiteSpace(maxboxcode3))
			{
			maxboxcode3 = "Z" + maxCodestr2 + "0001"; // 支号批号+第几箱
			}
			else
			{
			maxboxcode3 = maxboxcode3.Substring(0, 11) + (int.Parse(maxboxcode3.Substring(11, 4)) + 1).ToString().PadLeft(4, '0');
			}

			// 将条码保存到原料条码表
			var labelModel = new BllBoxInfo()
			{
			BoxNo = maxboxcode2,
			BoxNo3 = maxboxcode3,
			Qty = d,
			FullQty = bNum,
			Status = "0",
			SkuNo = model.SkuNo,
			SkuName = skuModel.SkuName,
			LotNo = maxCodestr2,
			Standard = skuModel.Standard,
			PackageStandard = packStr,
			InspectMark = "0",
			BitBoxMark = bNum > boxQty ? "1" : "0",
			InspectStatus = "0",

			ProductionTime = DateTime.Parse(model.TimeFrom),
			StoreTime = DateTime.Parse(model.TimeEnd),
			ExpirationTime = DateTime.Parse(model.TimeEnd),

			Origin = "WMS生成",
			CreateUser = (int)model.userId,
			CreateTime = DateTime.Now,
			};

			Db.Insertable(labelModel).ExecuteCommand();
			modelList.Add(labelModel);
			}
			}
			#endregion
			}
			Db.CommitTran();

			return modelList;
			}
			catch (Exception ex)
			{
			Db.RollbackTran();
			throw new Exception(ex.Message);
			}
			}
			#endregion

			}
			}