JC24WMS.git - Gitblit

			@@ -131,7 +131,7 @@
			}

			//获取入库单明细剩余打印数量
			public string GetAsnDetailQtyList(int id)
			public LabelPrintInfoDto GetAsnDetailQtyList(int id)
			{
			try
			{
			@@ -140,11 +140,29 @@
			{
			throw new Exception("未查询到入库单明细");
			}
			var data = new LabelPrintInfoDto();

			var notice = Db.Queryable<BllArrivalNotice>().Where(m => m.IsDel == "0" && m.ASNNo == detail.ASNNo).First();
			if (notice != null && notice.Type == "4") //判断是否是余料退回单
			{
			var noticeStr = Db.Queryable<BllArrivalNotice>().Where(m => m.Type == "1").Select(m => m.ASNNo).ToList();
			var detailOld = Db.Queryable<BllArrivalNoticeDetail>().Where(m => m.IsDel == "0" && noticeStr.Contains(m.ASNNo) && m.SkuNo == detail.SkuNo && m.LotNo == detail.LotNo).OrderByDescending(m => m.CreateTime).First();
			if (detailOld != null)
			{
			var boxInfo = Db.Queryable<BllBoxInfo>().First(m => m.IsDel == "0" && m.ASNNo == detailOld.ASNNo);
			if (boxInfo!= null)
			{
			data.ProductionTime = boxInfo.ProductionTime!= null ? ((DateTime)boxInfo.ProductionTime).ToString("yyyy-MM-dd"):"";
			data.ExpirationTime = boxInfo.ExpirationTime != null ? ((DateTime)boxInfo.ExpirationTime).ToString("yyyy-MM-dd") : "";
			data.StoreTime = boxInfo.StoreTime != null ? ((DateTime)boxInfo.StoreTime).ToString("yyyy-MM-dd") : "";
			}
			}
			}

			var labelQty = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.ASNDetailNo == id).Sum(m => m.Qty);
			var qty = detail.Qty - labelQty;

			return qty.ToString();
			data.Qty = qty.ToString();
			return data;
			}
			catch (Exception e)
			{
			@@ -330,7 +348,7 @@
			{
			if (!TypeLot.Contains(model.Type))
			{
			if (detailModel.LotNo.Length != 10)
			if (detailModel.LotNo.Length != 12 && detailModel.LotNo.Length != 11 && detailModel.LotNo.Length != 10)
			{
			strMessage = "-1:进厂编号位数长度有误;";
			continue;
			@@ -376,7 +394,7 @@
			sqlDetailStr += "LotNo,LotText,Qty,PackagNo,Price,Money,IsBale,IsBelt,SupplierLot,Status,Lot1,Lot2,UDF1,UDF2,UDF3,UDF4,UDF5,CreateUser) values ( ";
			sqlDetailStr += $"'{model.ASNNo}','{detailModel.SkuNo}','{detailModel.SkuName}','{detailModel.Standard}', ";
			sqlDetailStr += $"'{detailModel.LotNo}','{detailModel.LotText}','{detailModel.Qty}','{detailModel.PackagNo}','{detailModel.Price}', ";
			sqlDetailStr += $"'{detailModel.Money},'{detailModel.IsBale}','{detailModel.IsBelt}','{detailModel.SupplierLot}','0','{detailModel.Lot1}','{detailModel.Lot2}', ";
			sqlDetailStr += $"'{detailModel.Money}','{detailModel.IsBale}','{detailModel.IsBelt}','{detailModel.SupplierLot}','0','{detailModel.Lot1}','{detailModel.Lot2}', ";
			sqlDetailStr += $"'{detailModel.UDF1}','{detailModel.UDF2}','{detailModel.UDF3}','{detailModel.UDF4}','{detailModel.UDF5}','{model.CreateUser}');";

			if (model.Type == "0")//成品入库单下发WCS信息
			@@ -411,34 +429,34 @@
			{
			new OperationASNServer().AddLogOperationAsn("入库作业", "入库单据", model.ASNNo, "添加", $"添加了单据号为{model.ASNNo}的单据信息", Convert.ToInt32(model.CreateUser));

			//if (addOder.Count > 0)
			//{
			// // 正式运行程序放开
			// var jsonData = JsonConvert.SerializeObject(addOder);
			// string response = "";
			if (addOder.Count > 0)
			{
			// 正式运行程序放开
			var jsonData = JsonConvert.SerializeObject(addOder);
			string response = "";

			// try
			// {
			// var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
			// //给WCS下发入库单信息
			// response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");
			try
			{
			var time1 = DateTime.Now;//发送时间 .ToString("yyyy-MM-dd HH:mm:ss")
			//给WCS下发入库单信息
			response = HttpHelper.DoPost(url, jsonData, "下发给WCS出库命令", "WCS");

			// //////解析返回数据
			// var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
			// if (wcsModel.StatusCode == 0)
			// {

			// }
			// if (wcsModel.StatusCode == -1)
			// {
			//解析返回数据
			var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
			if (wcsModel.StatusCode == 0)
			{

			// }
			// }
			// catch (Exception ex)
			// {
			// throw new Exception(ex.Message);
			// }
			//}
			}
			if (wcsModel.StatusCode == -1)
			{
			throw new Exception($"下发WCS失败：{wcsModel.Msg}");
			}
			}
			catch (Exception ex)
			{
			throw new Exception(ex.Message);
			}
			}
			return strMessage;
			}
			else
			@@ -449,6 +467,7 @@
			}
			catch (Exception ex)
			{
			Db.Ado.RollbackTran();
			throw new Exception(ex.Message);
			}
			}
			@@ -1083,10 +1102,22 @@
			}

			//订单回传上游系统
			public bool FinishAsn(int id, string erpUrl, string mesUrl,string mesTokenUrl, int userId)
			public bool FinishAsn(int id, string erpUrl, string mesUrl,string mesTokenUrl,string userNo,string pwd, int userId)
			{
			try
			{
			var loginPwd = Md5Tools.CalcMd5(pwd);
			var date = Db.Queryable<SysUserInfor>().First(m =>m.IsDel=="0" && m.UserName == userNo && m.PassWord == loginPwd);

			if (date == null) //账号密码是否正确
			{
			throw new Exception("账号密码不正确或没有此账号");
			}
			if (date.Status != "0") //当前账号是否正常启用
			{
			throw new Exception("当前账号非启用状态");
			}

			var notice = Db.Queryable<BllArrivalNotice>().First(m => m.Id == id && m.IsDel == "0");
			if (notice == null)
			{
			@@ -1101,7 +1132,7 @@
			{
			throw new Exception("未查询到单据明细信息");
			}
			if (userId == notice.UpdateUser)
			if (date.Id == notice.UpdateUser)
			{
			throw new Exception("复核失败，复核人员和关闭订单人员不能相同！");
			}
			@@ -1182,10 +1213,10 @@

			notice.Status = "4";
			notice.CheckTime = DateTime.Now;
			notice.CheckUser = userId;
			notice.CheckUser = date.Id;
			Db.Updateable(notice).ExecuteCommand();

			new OperationASNServer().AddLogOperationAsn("入库作业", "入库单据", notice.ASNNo, "复核", $"复核了单据号为{notice.ASNNo}的单据信息", userId);
			new OperationASNServer().AddLogOperationAsn("入库作业", "入库单据", notice.ASNNo, "复核", $"{date.RealName}复核了单据号为{notice.ASNNo}的单据信息", userId);
			return true;
			}
			catch (Exception e)