From 0651efda1f08d417c82994887c68dfea2c9b4235 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 11 十二月 2024 11:28:37 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllTransServer/NoticeServer.cs | 206 +++++++++++++++++++++++++++++---------------------
1 files changed, 119 insertions(+), 87 deletions(-)
diff --git a/Wms/WMS.BLL/BllTransServer/NoticeServer.cs b/Wms/WMS.BLL/BllTransServer/NoticeServer.cs
index adf90cd..78fd9f2 100644
--- a/Wms/WMS.BLL/BllTransServer/NoticeServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/NoticeServer.cs
@@ -5,6 +5,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
+using Utility.Tools;
using WMS.BLL.LogServer;
using WMS.DAL;
using WMS.Entity.BllAsnEntity;
@@ -15,6 +16,7 @@
using WMS.Entity.LogEntity;
using WMS.Entity.SysEntity;
using WMS.IBLL.IBllTransServer;
+using static Model.InterFaceModel.RCSModel;
namespace WMS.BLL.BllTransServer
{
@@ -296,95 +298,95 @@
//鏇存柊鍌ㄤ綅鐘舵��
Db.Updateable(locatInfo).ExecuteCommand();
- #region 璐ㄦ璇烽獙
- var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == noticeDetail.SkuNo && m.LotNo == noticeDetail.LotNo && m.SupplierLot == noticeDetail.SupplierLot);
- if (qualityRequest == null)
- {
- //璐ㄦ璇烽獙鍗曚俊鎭�
- string qcNo = new Common().GetMaxNo("QC");
- qualityRequest = new BllQualityInspectionRequest();
- qualityRequest.QcNo = qcNo;
- qualityRequest.Status = "0";
- qualityRequest.SkuNo = noticeDetail.SkuNo;
- qualityRequest.SkuName = noticeDetail.SkuName;
- qualityRequest.LotNo = noticeDetail.LotNo;
- qualityRequest.SupplierLot = noticeDetail.SupplierLot;
- qualityRequest.Qty = noticeDetail.Qty;
- qualityRequest.SamplingQty = 0;
- qualityRequest.ASNNo = noticeDetail.ASNNo;
- qualityRequest.CreateUser = 0;
- qualityRequest.CreateTime = comTime;
+ #region 璐ㄦ璇烽獙锛屽幓鎺塎ES
+ //var qualityRequest = Db.Queryable<BllQualityInspectionRequest>().First(m => m.IsDel == "0" && m.SkuNo == noticeDetail.SkuNo && m.LotNo == noticeDetail.LotNo && m.SupplierLot == noticeDetail.SupplierLot);
+ //if (qualityRequest == null)
+ //{
+ // //璐ㄦ璇烽獙鍗曚俊鎭�
+ // string qcNo = new Common().GetMaxNo("QC");
+ // qualityRequest = new BllQualityInspectionRequest();
+ // qualityRequest.QcNo = qcNo;
+ // qualityRequest.Status = "0";
+ // qualityRequest.SkuNo = noticeDetail.SkuNo;
+ // qualityRequest.SkuName = noticeDetail.SkuName;
+ // qualityRequest.LotNo = noticeDetail.LotNo;
+ // qualityRequest.SupplierLot = noticeDetail.SupplierLot;
+ // qualityRequest.Qty = noticeDetail.Qty;
+ // qualityRequest.SamplingQty = 0;
+ // qualityRequest.ASNNo = noticeDetail.ASNNo;
+ // qualityRequest.CreateUser = 0;
+ // qualityRequest.CreateTime = comTime;
- // 璁板綍浠诲姟鏃ュ織
- var taskNo = new Common().GetMaxNo("TK");
- var exTask = new LogTask()
- {
- TaskNo = taskNo,
- Sender = "WMS",
- Receiver = "Limes",
- IsSuccess = 0,//鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
- StartLocat = "",//璧峰浣嶇疆
- PalletNo = "",//鎵樼洏鐮�
- IsSend = 1,//鏄惁鍙啀娆′笅鍙�
- IsCancel = 1,//鏄惁鍙彇娑�
- IsFinish = 1,//鏄惁鍙畬鎴�
- Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
- OrderType = "5",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗� 4 鍙栨牱鍑哄簱鍗� 5 鍏朵粬
- EndLocat = "",//鐩爣浣嶇疆
- Type = "3",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
- Msg = "璇烽獙浠诲姟"
- };
- // 鎻掑叆浠诲姟鏃ュ織
- Db.Insertable(exTask).ExecuteCommand();
+ // // 璁板綍浠诲姟鏃ュ織
+ // var taskNo = new Common().GetMaxNo("TK");
+ // var exTask = new LogTask()
+ // {
+ // TaskNo = taskNo,
+ // Sender = "WMS",
+ // Receiver = "Limes",
+ // IsSuccess = 0,//鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+ // StartLocat = "",//璧峰浣嶇疆
+ // PalletNo = "",//鎵樼洏鐮�
+ // IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+ // IsCancel = 1,//鏄惁鍙彇娑�
+ // IsFinish = 1,//鏄惁鍙畬鎴�
+ // Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ // OrderType = "5",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗� 4 鍙栨牱鍑哄簱鍗� 5 鍏朵粬
+ // EndLocat = "",//鐩爣浣嶇疆
+ // Type = "3",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ // Msg = "璇烽獙浠诲姟"
+ // };
+ // // 鎻掑叆浠诲姟鏃ュ織
+ // Db.Insertable(exTask).ExecuteCommand();
- // 璋冪敤Limes鎺ュ彛鍙戣捣璇烽獙
- var sendModel = new SendLimesModel()
- {
- QcNo = qualityRequest.QcNo,
- SkuNo = qualityRequest.SkuNo,
- Qty = qualityRequest.Qty.ToString(),
- LotNo = qualityRequest.LotNo,
- SupplierLot = qualityRequest.SupplierLot,
- RequestUser = "", // 璇烽獙浜�
- };
- var jsonData = JsonConvert.SerializeObject(sendModel);
- string response = "";
- try
- {
- var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
- //response = HttpHelper.DoPost(url, jsonData, "涓婁紶Limes绯荤粺鍙戣捣璇烽獙", "Limes");
- var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
+ // // 璋冪敤Limes鎺ュ彛鍙戣捣璇烽獙
+ // var sendModel = new SendLimesModel()
+ // {
+ // QcNo = qualityRequest.QcNo,
+ // SkuNo = qualityRequest.SkuNo,
+ // Qty = qualityRequest.Qty.ToString(),
+ // LotNo = qualityRequest.LotNo,
+ // SupplierLot = qualityRequest.SupplierLot,
+ // RequestUser = "", // 璇烽獙浜�
+ // };
+ // var jsonData = JsonConvert.SerializeObject(sendModel);
+ // string response = "";
+ // try
+ // {
+ // var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+ // //response = HttpHelper.DoPost(url, jsonData, "涓婁紶Limes绯荤粺鍙戣捣璇烽獙", "Limes");
+ // var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
- ////瑙ｆ瀽杩斿洖鏁版嵁
- //var limesModel = JsonConvert.DeserializeObject<LimesModel>(response);
- List<string> list1 = new List<string>();
- list1.Add(taskNo);
- //if (limesModel.Success == 0)
- //{
- //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
- new TaskServer().EditTaskIssueOk(list1, time1, time2);
+ // ////瑙ｆ瀽杩斿洖鏁版嵁
+ // //var limesModel = JsonConvert.DeserializeObject<LimesModel>(response);
+ // List<string> list1 = new List<string>();
+ // list1.Add(taskNo);
+ // //if (limesModel.Success == 0)
+ // //{
+ // //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+ // new TaskServer().EditTaskIssueOk(list1, time1, time2);
- // 鏇存柊璇烽獙鍗曚俊鎭�
- qualityRequest.Status = "1";
- qualityRequest.SamplingQty = 10;//decimal.Parse(limesModel.SamplingQty);
- qualityRequest.RequestUser = 0;
- qualityRequest.RequestTime = DateTime.Now;
- qualityRequest.UpdateTime = DateTime.Now;
- qualityRequest.UpdateUser = 0;
- //娣诲姞璐ㄦ璇烽獙鍗�
- Db.Insertable(qualityRequest).ExecuteCommand();
- //}
- //if (limesModel.Success == -1)
- //{
- // new TaskServer().EditTaskIssueNo(list1, time1, time2,limesModel.Message);
- // throw new Exception(limesModel.Message);
- //}
- }
- catch (Exception ex)
- {
- throw new Exception(ex.Message);
- }
- }
+ // // 鏇存柊璇烽獙鍗曚俊鎭�
+ // qualityRequest.Status = "1";
+ // qualityRequest.SamplingQty = 10;//decimal.Parse(limesModel.SamplingQty);
+ // qualityRequest.RequestUser = 0;
+ // qualityRequest.RequestTime = DateTime.Now;
+ // qualityRequest.UpdateTime = DateTime.Now;
+ // qualityRequest.UpdateUser = 0;
+ // //娣诲姞璐ㄦ璇烽獙鍗�
+ // Db.Insertable(qualityRequest).ExecuteCommand();
+ // //}
+ // //if (limesModel.Success == -1)
+ // //{
+ // // new TaskServer().EditTaskIssueNo(list1, time1, time2,limesModel.Message);
+ // // throw new Exception(limesModel.Message);
+ // //}
+ // }
+ // catch (Exception ex)
+ // {
+ // throw new Exception(ex.Message);
+ // }
+ //}
#endregion
break;
@@ -492,7 +494,7 @@
sd3.LocatNo = endLocatInfo2.LocatNo;//鍌ㄤ綅鍦板潃
if (endLocatInfo2.AreaNo.Contains("01"))//娲佸噣鍖�
{
- sd3.PalletStatus = "0";
+ sd3.PalletStatus = "0";
}
else if (endLocatInfo2.AreaNo.Contains("02"))//棰勬贩鍖�
{
@@ -509,7 +511,7 @@
sd3.SkuNo = "";
sd3.SkuName = "";
sd3.InspectStatus = "0";//寰呮楠�
- }
+ }
}
else if (taskInfo.Type == "1")//鍑哄簱浠诲姟
{
@@ -583,6 +585,11 @@
//淇敼搴撳瓨鏄庣粏
Db.Updateable(sd3).ExecuteCommand();
+ #region 鍘绘帀MES
+ //鍥炰紶妗剁姸鎬佺粰MES
+ //BackPalletStatus(taskInfo.PalletNo, sd3.PalletStatus);
+ #endregion
+
break;
#endregion
}
@@ -606,6 +613,31 @@
}
/// <summary>
+ /// 鍥炰紶妗剁姸鎬佺粰MES
+ /// </summary>
+ /// <param name="PalletNo">妗跺彿</param>
+ /// <param name="Status">0锛氬噣妗� 1锛氶娣� 2锛氬崐鎴愬搧 3锛氳剰妗�</param>
+ /// <param name="url"></param>
+ public void BackPalletStatus(string PalletNo, string Status,string url="")
+ {
+ try
+ {
+ var obj = new
+ {
+ PalletNo = PalletNo,
+ Status = Status
+ };
+ string jsonReq = JsonConvert.SerializeObject(obj);
+ var response = HttpHelper.DoPost(url, jsonReq, "鍥炰紶MES妗剁姸鎬�", "MES").ToString();
+ var result = JsonConvert.DeserializeObject<ReMes>(response);//瑙ｆ瀽杩斿洖鏁版嵁
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ }
+
+ /// <summary>
/// 涓嬪彂鍑哄簱鍗�
/// </summary>
/// <param name="model"></param>
--
Gitblit v1.8.0