From 6167bf4c8fe617d9f9861585042149d48ad15dbb Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期二, 13 五月 2025 17:54:50 +0800
Subject: [PATCH] 修改问题，添加PDA下发出库页面
---
Wms/WMS.BLL/HttpServer.cs | 121 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 116 insertions(+), 5 deletions(-)
diff --git a/Wms/WMS.BLL/HttpServer.cs b/Wms/WMS.BLL/HttpServer.cs
index 4175a56..4d9c3e5 100644
--- a/Wms/WMS.BLL/HttpServer.cs
+++ b/Wms/WMS.BLL/HttpServer.cs
@@ -1,4 +1,6 @@
锘縰sing Model.InterFaceModel;
+using Model.ModelVm;
+using Newtonsoft.Json;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -8,6 +10,7 @@
using WMS.BLL.LogServer;
using WMS.DAL;
using WMS.Entity.BllAsnEntity;
+using WMS.Entity.BllQualityEntity;
using WMS.Entity.BllSoEntity;
using WMS.Entity.Context;
using WMS.Entity.DataEntity;
@@ -80,7 +83,7 @@
}
}
var upShelfOldList = Db.Queryable<BllPalletUpShelf>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1")).ToList();
- if (upShelfOldList != null) //鏌ヨ鍒板叆搴撲俊鎭�
+ if (upShelfOldList.Count != 0) //鏌ヨ鍒板叆搴撲俊鎭�
{
var upShelfOld = upShelfOldList.First();
var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == upShelfOld.TaskNo);
@@ -287,8 +290,8 @@
// 娣诲姞鎵樼洏缁戝畾琛ㄦ墭鐩樺叆搴撲换鍔″彿 liudl
foreach (DataStockDetail stockModel in stockDetail)
{
- var bindModel = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.Status == "2"
- && m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo);
+ var bindModel = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.Status == "2"
+ && m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo).OrderByDescending(m=>m.CreateTime).First();
if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
{
bindModel.TaskNo = taskNo;
@@ -590,8 +593,8 @@
foreach (DataStockDetail stockModel in stockDetail)
{
- var bindModel = Db.Queryable<BllPalletBind>().First(m => m.IsDel == "0" && m.Status == "2"
- && m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo);
+ var bindModel = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.Status == "2"
+ && m.PalletNo == stockModel.PalletNo && m.ASNNo == stockModel.ASNNo && m.ASNDetailNo == stockModel.ASNDetailNo).OrderByDescending(m=>m.CreateTime).First();
if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
{
bindModel.TaskNo = taskNo;
@@ -1243,5 +1246,113 @@
}
+
+ #region MyRegion
+
+
+ /// <summary>
+ /// 鍚慙imes鍙戦�佽楠屼俊鎭�
+ /// </summary>
+ /// <param name="model">model.Id:璇烽獙鍗曚富閿紱model.Code:鍑哄簱鍙� </param>
+ /// <param name="userId">鎿嶄綔鐢ㄦ埛</param>
+ /// <param name="url">Wcs鍦板潃</param>
+ /// <returns></returns>
+ public bool SendInspectionRequest(IdVm model, int userId, string url, string userName)
+ {
+ try
+ {
+ // 鍒ゆ柇璇烽獙鍗曠姸鎬�
+ var data = Db.Queryable<BllQualityInspectionRequest>()
+ .Where(m => m.QcNo == model.Code && m.IsDel == "0" && m.Status == "0").ToList().FirstOrDefault();
+ if (data == null)
+ {
+ throw new Exception("鎿嶄綔澶辫触!璇烽獙鍗曠姸鎬佸彉鏇�.");
+ }
+
+ // 璁板綍浠诲姟鏃ュ織
+ //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 = data.QcNo,
+ SkuNo = data.SkuNo,
+ Qty = data.Qty.ToString(),
+ LotNo = data.LotNo,
+ SupplierLot = data.SupplierLot,
+ RequestUser = userName, // 璇烽獙浜�
+ };
+ 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);
+ //if (limesModel.Success == 0)
+ //{
+
+
+ // 鏇存柊璇烽獙鍗曚俊鎭�
+ data.Status = "1";
+ data.SamplingQty = 10;//decimal.Parse(limesModel.SamplingQty);
+ data.RequestUser = userId;
+ data.RequestTime = DateTime.Now;
+ data.UpdateTime = DateTime.Now;
+ data.UpdateUser = userId;
+
+ Db.Updateable(data).ExecuteCommand();
+ //}
+ //if (limesModel.Success == -1)
+ //{
+
+ // throw new Exception(limesModel.Message);
+ //}
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+
+ //娣诲姞鎿嶄綔鏃ュ織璁板綍
+ var k = new OperationCrServer()
+ .AddLogOperationCr("璐ㄩ噺绠＄悊", "璐ㄦ璇烽獙", model.Code, "璇烽獙", $"鍚戣川閲忛儴鍒嗗彂璧疯楠�!", userId);
+
+ return true;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+ #endregion
+
+
}
}
--
Gitblit v1.8.0