From 48df8080d7befac9fff4f5345750699c592512f6 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期三, 07 五月 2025 08:21:28 +0800
Subject: [PATCH] 修改问题
---
Wms/Utility/Tools/HttpHelper.cs | 13
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 18
HTML/views/BaseSetting/Materials.html | 2
Wms/Wms/appsettings.json | 2
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 32
HTML/views/BaseSetting/MaterialsForm.html | 47
Wms/WMS.BLL/SysServer/MaterialsServer.cs | 12
Wms/WMS.IBLL/IBllAsnServer/IPalletBindServer.cs | 4
Wms/Model/InterFaceModel/HttpModel.cs | 18
Wms/WMS.BLL/Logic/AllotLocation.cs | 102 +++
Wms/Wms/Controllers/DownApiController.cs | 139 ++--
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 1502 +++++++++++++++++++++++-----------------------
12 files changed, 1,015 insertions(+), 876 deletions(-)
diff --git a/HTML/views/BaseSetting/Materials.html b/HTML/views/BaseSetting/Materials.html
index 60597c2..93a71ec 100644
--- a/HTML/views/BaseSetting/Materials.html
+++ b/HTML/views/BaseSetting/Materials.html
@@ -398,7 +398,7 @@
field: 'Origin',title: '鏉ユ簮',align: 'center',width: 200
},
{
- field: 'UnitName',title: '鍗曚綅',align: 'center',width: 100
+ field: 'UnitNo',title: '鍗曚綅',align: 'center',width: 100
},
{
field: 'PackagName',title: '鍖呰',align: 'center',width: 100
diff --git a/HTML/views/BaseSetting/MaterialsForm.html b/HTML/views/BaseSetting/MaterialsForm.html
index a2ee30a..b39edbe 100644
--- a/HTML/views/BaseSetting/MaterialsForm.html
+++ b/HTML/views/BaseSetting/MaterialsForm.html
@@ -124,10 +124,9 @@
<!-- 鍗曚綅 -->
<div class="layui-inline">
<label class="layui-form-label">鍗曚綅</label>
- <div class="layui-input-block" style="width: 182px;">
- <select name="UnitNo" id="UnitNo" lay-verify="" lay-search>
- <option value=""></option>
- </select>
+ <div class="layui-input-block" style="width: 182px;">
+ <input type="text" name="UnitNo" id="UnitNo" placeholder="璇疯緭鍏ュ崟浣�" lay-verify="" autocomplete="off"
+ class="layui-input">
</div>
</div>
<!-- 鍖呰 -->
@@ -276,26 +275,26 @@
});
- var sel1 = false;
- //鑾峰彇鍗曚綅涓嬫媺鑿滃崟 UnitNo
- synData(IP + "/Basis/GetUnitList", {}, 'get', function (res) {
- if (res.code == 0) //鎴愬姛
- {
- for (var i = 0; i < res.data.length; i++) {
- $("#UnitNo").append('<option value =' + res.data[i].UnitNo + '>' + res.data[i].UnitName + '</option>');
- }
- form.render('select');
- sel1 = true;
- }
- else //涓嶆垚鍔�
- {
- layer.msg(res.msg, {
- icon: 2,
- time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
- }, function () { sel1 = true; });
- }
+ var sel1 = true;
+ // //鑾峰彇鍗曚綅涓嬫媺鑿滃崟 UnitNo
+ // synData(IP + "/Basis/GetUnitList", {}, 'get', function (res) {
+ // if (res.code == 0) //鎴愬姛
+ // {
+ // for (var i = 0; i < res.data.length; i++) {
+ // $("#UnitNo").append('<option value =' + res.data[i].UnitNo + '>' + res.data[i].UnitName + '</option>');
+ // }
+ // form.render('select');
+ // sel1 = true;
+ // }
+ // else //涓嶆垚鍔�
+ // {
+ // layer.msg(res.msg, {
+ // icon: 2,
+ // time: 2000 //2绉掑叧闂紙濡傛灉涓嶉厤缃紝榛樿鏄�3绉掞級
+ // }, function () { sel1 = true; });
+ // }
- });
+ // });
var sel2 = false;
//鑾峰彇鍖呰涓嬫媺鑿滃崟 PackagNo
synData(IP + "/Basis/GetPackagList", {}, 'get', function (res) {
@@ -352,7 +351,7 @@
$("#IsControlled option[value='" + res.data.IsControlled + "']").attr("selected", "selected"); // 鏄惁鍙楁帶
$("#IsInspect option[value='" + res.data.IsInspect + "']").attr("selected", "selected"); // 鏄惁鍏嶆
$("#IsPasteCode option[value='" + res.data.IsPasteCode + "']").attr("selected", "selected"); // 鏄惁璐存爣
- $("#UnitNo option[value='" + res.data.UnitNo + "']").attr("selected", "selected");// 鍗曚綅
+ $("input[name='UnitNo']").val(res.data.UnitNo);
$("#PackagNo option[value='" + res.data.PackagNo + "']").attr("selected", "selected"); // 鍖呰
// $("#PackagNo").attr("disabled", "disabled")
$("#Environment option[value='" + res.data.Environment + "']").attr("selected", "selected"); // 瀛樺偍鐜
diff --git a/Wms/Model/InterFaceModel/HttpModel.cs b/Wms/Model/InterFaceModel/HttpModel.cs
index ae83817..b176c7f 100644
--- a/Wms/Model/InterFaceModel/HttpModel.cs
+++ b/Wms/Model/InterFaceModel/HttpModel.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Text;
namespace Model.InterFaceModel
@@ -80,6 +81,21 @@
public int StatusCode { get; set; }
public string Msg { get; set; }
}
+
+ public enum PLCTypeEnum
+ {
+ /// <summary>
+ /// AGV灏忚溅
+ /// </summary>
+ [Description("AGV灏忚溅")]
+ AGV = 2,
+ /// <summary>
+ /// 绌挎杞�
+ /// </summary>
+ [Description("绌挎杞�")]
+ ShuttleCar = 7
+ }
+
/// <summary>
/// Wms涓撶敤 涓嬪彂鎸囦护Dto
/// </summary>
@@ -95,6 +111,8 @@
/// </summary>
public string TaskType { get; set; }
+ public PLCTypeEnum Type { get; set; }
+
/// <summary>
/// 鎵樼洏鍙�
/// </summary>
diff --git a/Wms/Utility/Tools/HttpHelper.cs b/Wms/Utility/Tools/HttpHelper.cs
index 28bef60..050dc00 100644
--- a/Wms/Utility/Tools/HttpHelper.cs
+++ b/Wms/Utility/Tools/HttpHelper.cs
@@ -4,7 +4,9 @@
using System.IO;
using System.Linq;
using System.Net;
+using System.Net.Security;
using System.Reflection;
+using System.Security.Cryptography.X509Certificates;
using System.Text;
using System.Xml;
using Newtonsoft.Json;
@@ -13,6 +15,11 @@
{
public class HttpHelper
{
+ private static bool CheckValidationResult(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors errors)
+ {
+ return true; //濡傛灉涓嶅笇鏈涢獙璇佽瘉涔︽湁鏁堟�э紝鐩存帴杩斿洖 true
+ }
+
private static HttpWebRequest GetHttpWebRequest(string url, Dictionary<string, string> headerDic, string method)
{
HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;
@@ -105,6 +112,10 @@
}
try
{
+ if (url.Contains("https"))
+ {
+ ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(CheckValidationResult);
+ }
var requestData = GetResponseString(request);
LogFile.SaveLogToFile($"{logStr}鍙嶉锛�( {requestData} ),", logStr2);
return requestData;
@@ -463,4 +474,6 @@
}
+
+
}
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index f3f3ab6..790a092 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -1806,6 +1806,758 @@
}
/// <summary>
+ /// 鐢宠宸烽亾(瀵嗛泦搴�)
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <param name="houseNo"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public OutCommandDto RequestMiJiRoadWay(string palletNo, string houseNo)
+ {
+ try
+ {
+ #region 楠岃瘉鎵樼洏鍚堟硶鎬�
+ //楠岃瘉鎵樼洏鏉＄爜鏄惁涓虹┖
+ if (string.IsNullOrEmpty(palletNo))
+ {
+ throw new Exception("璇疯緭鍏ヨ鐢宠鐨勬墭鐩樻潯鐮�");
+ }
+ //楠岃瘉鎵�灞炰粨搴撴槸鍚︿负绌�
+ if (string.IsNullOrEmpty(houseNo))
+ {
+ throw new Exception("璇烽�夋嫨鎵�灞炰粨搴�");
+ }
+ //鑾峰彇浠撳簱绫诲瀷
+ var houseType = Db.Queryable<SysWareHouse>().First(a => a.WareHouseNo == houseNo);
+ //楠岃瘉鏄惁涓哄瘑闆嗗簱
+ if (houseType.Type != "3")
+ {
+ throw new Exception("浠撳簱涓嶆槸瀵嗛泦搴�");
+ }
+
+ var stock = Db.Queryable<SysPallets>().First(a => a.PalletNo == palletNo);//鎵樼洏淇℃伅
+ //鍒ゆ柇鎵樼洏鏉＄爜鏄惁鏈夋晥
+ if (stock == null)
+ {
+ throw new Exception("鎵樼洏鏉＄爜涓嶅彈WMS绠＄悊锛屼笉鍙叆搴擄紒");
+ }
+ #endregion
+
+
+ OutCommandDto comDto;//杩斿洖wcs鐨勫叆搴撳懡浠�
+ #region
+
+ //鏌ヨ鎵樼洏缁戝畾淇℃伅(鐘舵�佷负绛夊緟鍏ュ簱/姝ｅ湪鎵ц鐨�)
+ var palletBindList = Db.Queryable<BllPalletBind>()
+ .Where(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1")).ToList();
+ var haveLocate = palletBindList.FirstOrDefault(m => !string.IsNullOrWhiteSpace(m.LocatNo));
+
+ var skuNo = ""; //鍏ュ簱鐗╂枡
+ var lotNo = ""; //鍏ュ簱鎵规
+
+ var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
+ if (palletBindList.Count >= 1) //姝ｅ父鍏ュ簱
+ {
+ var palletBind = palletBindList.FirstOrDefault(m => m.Status == "1");//鏌ヨ鏄惁鏈夋鍦ㄦ墽琛岀殑鎵樼洏缁戝畾
+ if (palletBind != null)
+ {
+ var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == palletBind.TaskNo);
+ if (beingTask == null)
+ {
+ throw new Exception("璇ユ墭鐩樻鍦ㄥ叆搴擄紝浣嗘湭鏌ヨ鍒颁换鍔′俊鎭�");
+ }
+
+ comDto = new OutCommandDto()
+ {
+ PalletNo = palletNo,//鎵樼洏鍙�
+ StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
+ StartLocate = beingTask.StartLocat, // 璧峰浣嶇疆
+ EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
+ EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
+ TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
+ TaskType = "0",// 浠诲姟绫诲瀷 (鍏ュ簱)
+ OutMode = "", //鐩爣鍦板潃
+ Order = 1
+ };
+ if (beingTask.IsSuccess == 0)
+ {
+ beingTask.IsSuccess = 1;
+ Db.Updateable(beingTask).ExecuteCommand();
+ }
+ return comDto;
+
+ }
+
+
+ // 楠岃瘉鏄惁鍏宠仈鍗曟嵁锛岃幏鍙栨墭鐩樹笂瀛樻斁鐨勭墿鏂�
+ if (palletBindList.First().Type == "0") //鐗╂枡鎵樺叆搴�
+ {
+ //鍒ゆ柇鏄惁缁戝畾鍗曟嵁鍙婂崟鎹姸鎬佹槸鍚︽甯�
+ foreach (var item in palletBindList)
+ {
+ var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == item.ASNNo);
+ if (notice == null)
+ {
+ throw new Exception("鎵樼洏瀛樺湪鐗╂枡鏈粦瀹氬叆搴撳崟锛屼笉鍙叆搴擄紒");
+ }
+ if (notice.Status == "3" || notice.Status == "4")
+ {
+ throw new Exception($"鍏ュ簱鍗晎item.ASNNo}宸插叧闂紝涓嶅彲鍏ュ簱锛�");
+ }
+ }
+
+ //鑾峰彇鐗╂枡瀛樻斁鍖哄煙
+ var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m =>
+ m.IsDel == "0" && m.Id == palletBindList.First().ASNDetailNo);
+ if (noticeDetail == null)
+ {
+ throw new Exception("鎵樼洏瀛樺湪鐗╂枡鏈粦瀹氬叆搴撳崟鏄庣粏锛屼笉鍙叆搴�");
+ }
+
+ skuNo = noticeDetail.SkuNo;
+ lotNo = noticeDetail.LotNo;
+
+ }
+ else if (palletBindList.First().Type == "1")//绌烘墭鐩�
+ {
+ skuNo = "100099";
+ }
+ }
+ else //鍥炴祦鍏ュ簱
+ {
+ if (stockDetail.Count == 0)
+ {
+ throw new Exception($"{palletNo}鎵樼洏涓嶅瓨鍦ㄥ簱瀛樹俊鎭紝涓嶅彲鍏ュ簱锛�");
+ }
+ if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
+ {
+ throw new Exception("褰撳墠鎵樼洏宸插湪搴撳唴锛岃鏍稿疄");
+ }
+ skuNo = stockDetail.First().SkuNo;
+ lotNo = stockDetail.First().LotNo;
+
+ #region 鍒ゆ柇浠诲姟鏄惁宸茬粡瀛樺湪锛岃嫢瀛樺湪鐩存帴杩斿洖浠诲姟锛�
+ var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0"
+ && (m.Status == "0" || m.Status == "1") && m.PalletNo == palletNo && m.Type == "0");
+ if (beingTask != null)
+ {
+ comDto = new OutCommandDto()
+ {
+ PalletNo = palletNo,//鎵樼洏鍙�
+ StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
+ StartLocate = beingTask.StartLocat, // 璧峰浣嶇疆
+ EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
+ EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
+ TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
+ TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
+ OutMode = "", //鐩爣鍦板潃
+ Order = 1
+ };
+ if (beingTask.IsSuccess == 0)
+ {
+ beingTask.IsSuccess = 1;
+ beingTask.Status = "1";
+ Db.Updateable(beingTask).ExecuteCommand();
+ }
+
+ return comDto;
+ }
+ #endregion
+
+ #region 鍒ゆ柇璇ユ墭鐩橈紝鏄惁绗﹀悎鍥炲簱鍔熻兘璁惧畾鐨勫洖搴撹鍒�
+ //鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
+ var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0"
+ && a.FunSetNo == "Fun041" && a.IsEnable == "NO");
+ if (function != null)
+ {
+ //鎷ｈ揣瀹屾垚鍚庡厑璁告墭鐩樺洖搴�
+ var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0"
+ && a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);
+
+ //楠岃瘉鎷ｈ揣鏄庣粏鏄惁瀛樺湪
+ if (allot != null)
+ {
+ //楠岃瘉褰撳墠鎵樼洏鎷ｈ揣淇℃伅鏄惁宸插畬鎴�
+ if (allot.Status != "5")
+ {
+ throw new Exception("褰撳墠鎵樼洏鎷ｈ揣淇℃伅鏈畬鎴愶紝璇峰畬鎴愬悗鍥炲簱锛�");
+ }
+ }
+ }
+ #endregion
+ }
+
+ var allotLocate = new AllotLocation();
+
+ SysStorageLocat locate;
+
+ #region 鏍规嵁sku纭鍖哄煙鍒掑垎
+
+ //鐗╂枡淇℃伅
+ var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == skuNo);
+ if (sku == null)
+ {
+ throw new Exception("鐗╂枡缂栫爜涓嶅瓨鍦紝涓嶅彲鍏ュ簱");
+ }
+ //鍒ゆ柇鐗╂枡鏄惁鍚湁绫诲埆淇℃伅
+ if (string.IsNullOrWhiteSpace(sku.CategoryNo))
+ {
+ throw new Exception($"鐗╂枡锛歿sku.SkuNo}鏈缃被鍒�,涓嶅彲鍏ュ簱");
+ }
+ //鐗╂枡绫诲埆淇℃伅
+ var skuCategory = Db.Queryable<SysMaterialCategory>().First(m => m.IsDel == "0" && m.CategoryNo == sku.CategoryNo);
+ if (skuCategory == null)
+ {
+ throw new Exception($"{sku.SkuNo}鐗╂枡绫诲埆涓嶅瓨鍦紝涓嶅彲鍏ュ簱");
+ }
+ //鏁寸悊鍖哄煙淇℃伅
+ var areaStr = skuCategory.AreaNo.Split(",");
+ var areaList = new List<string>();
+ foreach (var item in areaStr)
+ {
+ areaList.Add(item);
+ }
+
+
+ var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo))
+ .GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();
+
+
+ #endregion
+
+ var roadNo = allotLocate.GetMiJiSuiTableRoad(houseNo, roadList, areaList, skuNo, lotNo);
+
+ if (string.IsNullOrWhiteSpace(roadNo))
+ {
+ throw new Exception("鏈煡璇㈠埌瀛樺湪绌哄偍浣嶅贩閬�");
+ }
+
+ Db.BeginTran();
+ try
+ {
+ //娣诲姞宸烽亾浣跨敤璁板綍
+ var log = new SysRoadwayUseLog
+ {
+ RoadwayNo = roadNo,
+ WareHouseNo = houseNo,
+ Row = 0,
+ Column = 0,
+ Layer = 0,
+ };
+ Db.Insertable(log).ExecuteCommand();
+
+ // 娣诲姞鍏ュ簱鏃ュ織璁板綍
+ var taskNo = new Common().GetMaxNo("TK");
+ var exTask = new LogTask //鍏ュ簱浠诲姟
+ {
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "WCS",
+ IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+ SendDate = DateTime.Now, //鍙戦�佹椂闂�
+ BackDate = DateTime.Now, //杩斿洖鏃堕棿
+ StartRoadway = "", // 璧峰宸烽亾
+ StartLocat = "",//璧峰浣嶇疆
+ EndLocat = "",//鐩爣浣嶇疆
+ EndRoadway = roadNo, // 鐩爣宸烽亾
+ PalletNo = palletNo,//鎵樼洏鐮�
+ IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 1,//鏄惁鍙彇娑�
+ IsFinish = 1,//鏄惁鍙畬鎴�
+ Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ Status = "1",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
+ Msg = "鍏ュ簱鍙ｅ埌=>>" + roadNo + "宸烽亾鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
+
+ };
+ Db.Insertable(exTask).ExecuteCommand();
+
+ var asnNo = "";
+ // 娣诲姞鎵樼洏缁戝畾琛ㄦ墭鐩樺叆搴撲换鍔″彿 liudl
+ if (palletBindList.Count < 1)
+ {
+ 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);
+ if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
+ {
+ bindModel.TaskNo = taskNo;
+ bindModel.WareHouseNo = houseNo;
+ bindModel.RoadwayNo = roadNo;
+ Db.Updateable(bindModel).ExecuteCommand();
+ asnNo = stockModel.ASNNo;
+ }
+
+
+ }
+ }
+ foreach (DataStockDetail stockModel in stockDetail)
+ {
+ //娣诲姞鎵樼洏涓婃灦璁板綍
+ var upShelf = new BllPalletUpShelf()
+ {
+ TaskNo = exTask.TaskNo,
+ TraceNo = asnNo,
+ PalletNo = palletNo,
+ SkuNo = stockModel.SkuNo,
+ SkuName = stockModel.SkuName,
+ LotNo = stockModel.LotNo,
+ Status = "1",
+
+ WareHouseNo = houseNo,
+ RoadwayNo = roadNo,
+ AreaNo = "",
+ LocatNo = "",
+
+ CreateUser = 0,
+ };
+ Db.Insertable(upShelf).ExecuteCommand();
+ }
+
+
+ if (palletBindList.Count >= 1)
+ {
+ foreach (var item in palletBindList)
+ {
+ item.WareHouseNo = houseNo;
+ item.RoadwayNo = roadNo;
+ item.TaskNo = taskNo;
+ }
+ Db.Updateable(palletBindList).ExecuteCommand();
+ }
+ Db.CommitTran();
+
+ comDto = new OutCommandDto()
+ {
+ PalletNo = palletNo,//鎵樼洏鍙�
+ StartRoadway = "",
+ StartLocate = "", // 璧峰浣嶇疆
+ EndLocate = "", // 鐩爣浣嶇疆
+ EndRoadway = roadNo, // 鐩爣宸烽亾
+ TaskNo = taskNo, // 浠诲姟鍙�
+ TaskType = "0",// 浠诲姟绫诲瀷:鍏ュ簱浠诲姟
+ OutMode = "", //鐩爣鍦板潃
+ Order = 1
+ };
+ }
+ catch (Exception ex)
+ {
+ Db.RollbackTran();
+ throw new Exception(ex.Message);
+ }
+ #endregion
+
+ return comDto;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+ /// <summary>
+ /// 1 鐢宠鍌ㄤ綅 2 鐢宠宸烽亾鍚� 鍐嶇敵璇峰偍浣嶅偍浣�
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <param name="houseNo"></param>
+ /// <param name="roadwayNo"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public OutCommandDto RequestMiJiLocation(string palletNo, string houseNo, string roadwayNo)
+ {
+ try
+ {
+ //楠岃瘉鎵樼洏鏉＄爜鏄惁涓虹┖
+ if (string.IsNullOrEmpty(palletNo))
+ {
+ throw new Exception("璇疯緭鍏ヨ鐢宠鐨勬墭鐩樻潯鐮�");
+ }
+ //楠岃瘉鎵�灞炰粨搴撴槸鍚︿负绌�
+ if (string.IsNullOrEmpty(houseNo))
+ {
+ throw new Exception("璇烽�夋嫨鎵�灞炰粨搴�");
+ }
+ //楠岃瘉鏄惁涓哄钩搴撳叆搴�
+ if (houseNo == "W02")
+ {
+ throw new Exception("骞冲簱璇蜂娇鐢≒DA鎵嬫寔杩涜骞冲簱鍏ュ簱");
+ }
+
+ OutCommandDto comDto;//杩斿洖wcs鐨勫叆搴撳懡浠�
+ var isHaveLocateNo = false; //鎵樼洏缁戝畾淇℃伅涓槸鍚﹀凡鏈夋寚瀹氬偍浣�
+
+ var stock = Db.Queryable<SysPallets>().First(a => a.PalletNo == palletNo);//鎵樼洏淇℃伅
+
+ //鍒ゆ柇鎵樼洏鏉＄爜鏄惁鏈夋晥
+ if (stock == null)
+ throw new Exception("鎵樼洏鏉＄爜涓嶅彈WMS绠＄悊锛屼笉鍙叆搴擄紒");
+
+ #region
+
+ //鏌ヨ鎵樼洏缁戝畾淇℃伅(鐘舵�佷负绛夊緟鍏ュ簱鐨�)
+ var palletBindList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1")).ToList();
+ var haveLocate = palletBindList.FirstOrDefault(m => !string.IsNullOrWhiteSpace(m.LocatNo));
+
+ var skuList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();
+ //鐗╂枡绫诲埆淇℃伅
+ var skuCategoryList = Db.Queryable<SysMaterialCategory>().Where(m => m.IsDel == "0").ToList();
+
+ var skuNo = ""; //鍏ュ簱鐗╂枡
+ var isAddTask = true; //鏄惁娣诲姞鏂颁换鍔�
+ var oldTaskNo = ""; //鏃т换鍔″彿
+ var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
+ if (palletBindList.Count >= 1) //姝ｅ父鍏ュ簱
+ {
+ var palletBind = palletBindList.FirstOrDefault(m => m.Status == "1");
+ if (palletBind != null)
+ {
+ var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == palletBind.TaskNo);
+ if (beingTask == null)
+ {
+ throw new Exception("璇ユ墭鐩樻鍦ㄥ叆搴擄紝浣嗘湭鏌ヨ鍒颁换鍔′俊鎭�");
+ }
+ if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
+ {
+ comDto = new OutCommandDto()
+ {
+ PalletNo = palletNo,//鎵樼洏鍙�
+ StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
+ StartLocate = "", // 璧峰浣嶇疆
+ EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
+ EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
+ TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
+ TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
+ OutMode = "", //鐩爣鍦板潃
+ Order = 1
+ };
+ if (beingTask.IsSuccess == 0)
+ {
+ beingTask.IsSuccess = 1;
+ Db.Updateable(beingTask).ExecuteCommand();
+ }
+ return comDto;
+ }
+ else
+ {
+ if (string.IsNullOrWhiteSpace(roadwayNo))
+ {
+ roadwayNo = beingTask.EndRoadway;
+ }
+ isAddTask = false;
+ oldTaskNo = beingTask.TaskNo;
+ }
+ }
+ if (haveLocate != null)
+ {
+ isHaveLocateNo = true; //宸叉湁鎸囧畾鍌ㄤ綅
+ }
+
+ if (palletBindList.First().Type == "0") //鐗╂枡鎵樺叆搴�
+ {
+ //鍒ゆ柇鏄惁缁戝畾鍗曟嵁鍙婂崟鎹姸鎬佹槸鍚︽甯�
+ foreach (var item in palletBindList)
+ {
+ var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == item.ASNNo);
+ if (notice == null)
+ {
+ throw new Exception("鎵樼洏瀛樺湪鐗╂枡鏈粦瀹氬叆搴撳崟锛屼笉鍙叆搴擄紒");
+ }
+ if (notice.Status == "3")
+ {
+ throw new Exception($"鍏ュ簱鍗晎item.ASNNo}宸插叧闂紝涓嶅彲鍏ュ簱锛�");
+ }
+ }
+
+ //鑾峰彇鐗╂枡瀛樻斁鍖哄煙
+ var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m =>
+ m.IsDel == "0" && m.Id == palletBindList.First().ASNDetailNo);
+ if (noticeDetail == null)
+ {
+ throw new Exception("鎵樼洏瀛樺湪鐗╂枡鏈粦瀹氬叆搴撳崟鏄庣粏锛屼笉鍙叆搴�");
+ }
+
+ skuNo = noticeDetail.SkuNo;
+
+ }
+ else if (palletBindList.First().Type == "1")//绌烘墭鐩�
+ {
+ skuNo = "100099";
+ }
+ }
+ else //鍥炴祦鍏ュ簱
+ {
+ if (stockDetail.Count == 0)
+ {
+ throw new Exception($"{palletNo}鎵樼洏鏉＄爜涓嶅叿鏈夌鐮佷俊鎭紝涓嶅彲鍏ュ簱锛�");
+ }
+ if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
+ {
+ throw new Exception("褰撳墠鎵樼洏宸插湪搴撳唴锛岃鏍稿疄");
+ }
+ skuNo = stockDetail.First().SkuNo;
+
+ var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0"
+ && (m.Status == "0" || m.Status == "1") && m.PalletNo == palletNo && m.Type == "0");
+ if (beingTask != null)
+ {
+ if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
+ {
+ comDto = new OutCommandDto()
+ {
+ PalletNo = palletNo,//鎵樼洏鍙�
+ StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
+ StartLocate = "", // 璧峰浣嶇疆
+ EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
+ EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
+ TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
+ TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
+ OutMode = "", //鐩爣鍦板潃
+ Order = 1
+ };
+ if (beingTask.IsSuccess == 0)
+ {
+ beingTask.IsSuccess = 1;
+ beingTask.Status = "1";
+ Db.Updateable(beingTask).ExecuteCommand();
+ }
+ return comDto;
+ }
+ else
+ {
+ if (string.IsNullOrWhiteSpace(roadwayNo))
+ {
+ roadwayNo = beingTask.EndRoadway;
+ }
+ isAddTask = false;
+ oldTaskNo = beingTask.TaskNo;
+ }
+ }
+
+ //鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
+ var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetName == "鎵樼洏鍥炲簱楠岃瘉" && a.IsEnable == "NO");
+ #region 鎵樼洏鍥炲簱瑙勫垯
+
+ if (function != null)
+ {
+ //鎷ｈ揣瀹屾垚鍚庡厑璁告墭鐩樺洖搴�
+ if (function.SetValue == "CompletePick")
+ {
+ var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);
+
+ //楠岃瘉鎷ｈ揣鏄庣粏鏄惁瀛樺湪
+ if (allot != null)
+ {
+ //楠岃瘉褰撳墠鎵樼洏鎷ｈ揣淇℃伅鏄惁宸插畬鎴�
+ if (allot.Status != "5")
+ {
+ throw new Exception("褰撳墠鎵樼洏鎷ｈ揣淇℃伅鏈畬鎴愶紝璇峰畬鎴愬悗鍥炲簱锛�");
+ }
+ }
+ }
+ }
+ #endregion
+ }
+
+ var allotLocate = new AllotLocation();
+
+ #region 鐢宠鍌ㄤ綅
+
+ SysStorageLocat locate;
+ if (isHaveLocateNo) //鎸囧畾鍌ㄤ綅
+ {
+ locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == haveLocate.LocatNo);
+ }
+ else
+ {
+ var sku = skuList.FirstOrDefault(m => m.SkuNo == skuNo);
+ if (sku == null)
+ {
+ throw new Exception("鐗╂枡淇℃伅涓湭鏌ヨ鍒板叆搴撳崟鏄庣粏鍖呭惈鐨勭墿鏂欎俊鎭紝涓嶅彲鍏ュ簱");
+ }
+ //鍒ゆ柇鐗╂枡鏄惁鍚湁绫诲埆淇℃伅
+ if (string.IsNullOrWhiteSpace(sku.CategoryNo))
+ {
+ throw new Exception($"鐗╂枡锛歿sku.SkuNo}鏈煡璇㈠埌绫诲埆淇℃伅");
+ }
+
+ var skuCategory = skuCategoryList.FirstOrDefault(m => m.CategoryNo == sku.CategoryNo);
+ if (skuCategory == null)
+ {
+ throw new Exception($"鏈湪绫诲埆淇℃伅涓煡璇㈠埌鐗╂枡锛歿sku.SkuNo}鍖呭惈鐨勭被鍒�");
+ }
+
+ var areaStr = skuCategory.AreaNo.Split(",");
+ var areaList = new List<string>();
+ foreach (var item in areaStr)
+ {
+ areaList.Add(item);
+ }
+
+ locate = allotLocate.GetMiJiSuiTableLocate(roadwayNo, areaList);
+ }
+
+ #endregion
+
+ Db.BeginTran();
+ try
+ {
+
+ if (isAddTask) // 姝ｅ父鍏ュ簱
+ {
+ var taskNo = new Common().GetMaxNo("TK");
+ var exTask = new LogTask //鍏ュ簱浠诲姟
+ {
+ TaskNo = taskNo,
+ Sender = "WMS",
+ Receiver = "WCS",
+ IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
+ SendDate = DateTime.Now, //鍙戦�佹椂闂�
+ BackDate = DateTime.Now, //杩斿洖鏃堕棿
+ StartRoadway = "", // 璧峰宸烽亾
+ StartLocat = "",//璧峰浣嶇疆
+ EndLocat = locate.LocatNo,//鐩爣浣嶇疆
+ EndRoadway = locate.RoadwayNo, // 鐩爣宸烽亾
+ PalletNo = palletNo,//鎵樼洏鐮�
+ IsSend = 1,//鏄惁鍙啀娆′笅鍙�
+ IsCancel = 1,//鏄惁鍙彇娑�
+ IsFinish = 1,//鏄惁鍙畬鎴�
+ Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
+ Status = "1",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
+ OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
+ Msg = "鍏ュ簱鍙ｅ埌=>>" + locate.LocatNo + "鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
+
+ };
+ Db.Insertable(exTask).ExecuteCommand();
+ var asnNo = "";
+ // 娣诲姞鎵樼洏缁戝畾琛ㄦ墭鐩樺叆搴撲换鍔″彿 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);
+ if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
+ {
+ bindModel.TaskNo = taskNo;
+ bindModel.WareHouseNo = locate.WareHouseNo;
+ bindModel.RoadwayNo = locate.RoadwayNo;
+ bindModel.LocatNo = locate.LocatNo;
+ Db.Updateable(bindModel).ExecuteCommand();
+ asnNo = stockModel.ASNNo;
+ }
+ }
+ foreach (DataStockDetail stockModel in stockDetail)
+ {
+ //娣诲姞鎵樼洏涓婃灦璁板綍
+ var upShelf = new BllPalletUpShelf()
+ {
+ TaskNo = exTask.TaskNo,
+ TraceNo = asnNo,
+ PalletNo = palletNo,
+ SkuNo = stockModel.SkuNo,
+ SkuName = stockModel.SkuName,
+ LotNo = stockModel.LotNo,
+ Status = "1",
+
+ WareHouseNo = houseNo,
+ RoadwayNo = locate.RoadwayNo,
+ AreaNo = locate.AreaNo,
+ LocatNo = locate.LocatNo,
+
+ CreateUser = 0,
+ };
+ Db.Insertable(upShelf).ExecuteCommand();
+ }
+
+ oldTaskNo = taskNo;
+ }
+ else
+ {
+ var oldTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == oldTaskNo);
+ oldTask.EndLocat = locate.LocatNo;
+ oldTask.EndRoadway = locate.RoadwayNo;
+ if (oldTask.IsSuccess == 0)
+ {
+ oldTask.IsSuccess = 1;
+ oldTask.Status = "1";
+ }
+ Db.Updateable(oldTask).ExecuteCommand();
+
+
+ var bindModelList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.Status == "2"
+ && m.PalletNo == oldTask.PalletNo && m.TaskNo == oldTaskNo).ToList();
+ foreach (var bindModel in bindModelList)
+ {
+ if (string.IsNullOrWhiteSpace(bindModel.LocatNo))
+ {
+ bindModel.TaskNo = oldTask.TaskNo;
+ bindModel.WareHouseNo = locate.WareHouseNo;
+ bindModel.RoadwayNo = locate.RoadwayNo;
+ bindModel.LocatNo = locate.LocatNo;
+ Db.Updateable(bindModel).ExecuteCommand();
+
+ }
+ }
+ //鏇存敼涓婃灦淇℃伅
+ var upShelfList = Db.Queryable<BllPalletUpShelf>().Where(m => m.IsDel == "0" && m.TaskNo == oldTask.TaskNo && m.PalletNo == palletNo).ToList();
+ foreach (var upShelf in upShelfList)
+ {
+ upShelf.WareHouseNo = locate.WareHouseNo;
+ upShelf.RoadwayNo = locate.RoadwayNo;
+ upShelf.LocatNo = locate.LocatNo;
+ upShelf.Status = "1";
+ Db.Updateable(upShelf).ExecuteCommand();
+
+ }
+
+
+ }
+
+ locate.Status = "2";
+ Db.Updateable(locate).ExecuteCommand();
+ if (palletBindList.Count >= 1)
+ {
+ foreach (var item in palletBindList)
+ {
+ item.Status = "1";
+ item.WareHouseNo = locate.WareHouseNo;
+ item.RoadwayNo = locate.RoadwayNo;
+ item.LocatNo = locate.LocatNo;
+ item.TaskNo = oldTaskNo;
+ }
+ Db.Updateable(palletBindList).ExecuteCommand();
+ }
+ Db.CommitTran();
+ comDto = new OutCommandDto()
+ {
+ PalletNo = palletNo,//鎵樼洏鍙�
+ StartRoadway = "",
+ StartLocate = "", // 璧峰浣嶇疆
+ EndLocate = locate.LocatNo, // 鐩爣浣嶇疆
+ EndRoadway = locate.RoadwayNo, // 鐩爣宸烽亾
+ TaskNo = oldTaskNo, // 浠诲姟鍙�
+ TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
+ OutMode = "", //鐩爣鍦板潃
+ Order = 1
+ };
+
+ }
+ catch (Exception ex)
+ {
+ Db.RollbackTran();
+ throw new Exception(ex.Message);
+ }
+ #endregion
+
+
+ return comDto;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+ }
+ }
+
+ /// <summary>
/// 涓嬪彂鍏ュ簱鐢宠鍌ㄤ綅浠诲姟锛堜笅鍙�==銆婣GV灏忚溅锛�
/// </summary>
/// <param name="model"></param>
@@ -2048,356 +2800,6 @@
#region 鐢宠鍌ㄤ綅銆佸贩閬� 浠诲姟瀹屾垚銆佸彇娑�
- /// <summary>
- /// 鐢宠宸烽亾(瀵嗛泦搴�)
- /// </summary>
- /// <param name="palletNo"></param>
- /// <param name="houseNo"></param>
- /// <returns></returns>
- /// <exception cref="Exception"></exception>
- public OutCommandDto RequestMiJiRoadWay(string palletNo, string houseNo)
- {
- try
- {
- #region 楠岃瘉鎵樼洏鍚堟硶鎬�
- //楠岃瘉鎵樼洏鏉＄爜鏄惁涓虹┖
- if (string.IsNullOrEmpty(palletNo))
- {
- throw new Exception("璇疯緭鍏ヨ鐢宠鐨勬墭鐩樻潯鐮�");
- }
- //楠岃瘉鎵�灞炰粨搴撴槸鍚︿负绌�
- if (string.IsNullOrEmpty(houseNo))
- {
- throw new Exception("璇烽�夋嫨鎵�灞炰粨搴�");
- }
- //鑾峰彇浠撳簱绫诲瀷
- var houseType = Db.Queryable<SysWareHouse>().First(a => a.WareHouseNo == houseNo);
- //楠岃瘉鏄惁涓哄瘑闆嗗簱
- if (houseType.Type != "3")
- {
- throw new Exception("浠撳簱涓嶆槸瀵嗛泦搴�");
- }
-
- var stock = Db.Queryable<SysPallets>().First(a => a.PalletNo == palletNo);//鎵樼洏淇℃伅
- //鍒ゆ柇鎵樼洏鏉＄爜鏄惁鏈夋晥
- if (stock == null)
- {
- throw new Exception("鎵樼洏鏉＄爜涓嶅彈WMS绠＄悊锛屼笉鍙叆搴擄紒");
- }
- #endregion
-
-
- OutCommandDto comDto;//杩斿洖wcs鐨勫叆搴撳懡浠�
- #region
-
- //鏌ヨ鎵樼洏缁戝畾淇℃伅(鐘舵�佷负绛夊緟鍏ュ簱/姝ｅ湪鎵ц鐨�)
- var palletBindList = Db.Queryable<BllPalletBind>()
- .Where(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1")).ToList();
- var haveLocate = palletBindList.FirstOrDefault(m => !string.IsNullOrWhiteSpace(m.LocatNo));
-
- var skuNo = ""; //鍏ュ簱鐗╂枡
- var lotNo = ""; //鍏ュ簱鎵规
-
- var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
- if (palletBindList.Count >= 1) //姝ｅ父鍏ュ簱
- {
- var palletBind = palletBindList.FirstOrDefault(m => m.Status == "1");//鏌ヨ鏄惁鏈夋鍦ㄦ墽琛岀殑鎵樼洏缁戝畾
- if (palletBind != null)
- {
- var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == palletBind.TaskNo);
- if (beingTask == null)
- {
- throw new Exception("璇ユ墭鐩樻鍦ㄥ叆搴擄紝浣嗘湭鏌ヨ鍒颁换鍔′俊鎭�");
- }
-
- comDto = new OutCommandDto()
- {
- PalletNo = palletNo,//鎵樼洏鍙�
- StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
- StartLocate = beingTask.StartLocat, // 璧峰浣嶇疆
- EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
- EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
- TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
- TaskType = "0",// 浠诲姟绫诲瀷 (鍏ュ簱)
- OutMode = "", //鐩爣鍦板潃
- Order = 1
- };
- if (beingTask.IsSuccess == 0)
- {
- beingTask.IsSuccess = 1;
- Db.Updateable(beingTask).ExecuteCommand();
- }
- return comDto;
-
- }
-
-
- // 楠岃瘉鏄惁鍏宠仈鍗曟嵁锛岃幏鍙栨墭鐩樹笂瀛樻斁鐨勭墿鏂�
- if (palletBindList.First().Type == "0") //鐗╂枡鎵樺叆搴�
- {
- //鍒ゆ柇鏄惁缁戝畾鍗曟嵁鍙婂崟鎹姸鎬佹槸鍚︽甯�
- foreach (var item in palletBindList)
- {
- var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == item.ASNNo);
- if (notice == null)
- {
- throw new Exception("鎵樼洏瀛樺湪鐗╂枡鏈粦瀹氬叆搴撳崟锛屼笉鍙叆搴擄紒");
- }
- if (notice.Status == "3" || notice.Status == "4")
- {
- throw new Exception($"鍏ュ簱鍗晎item.ASNNo}宸插叧闂紝涓嶅彲鍏ュ簱锛�");
- }
- }
-
- //鑾峰彇鐗╂枡瀛樻斁鍖哄煙
- var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m =>
- m.IsDel == "0" && m.Id == palletBindList.First().ASNDetailNo);
- if (noticeDetail == null)
- {
- throw new Exception("鎵樼洏瀛樺湪鐗╂枡鏈粦瀹氬叆搴撳崟鏄庣粏锛屼笉鍙叆搴�");
- }
-
- skuNo = noticeDetail.SkuNo;
- lotNo = noticeDetail.LotNo;
-
- }
- else if (palletBindList.First().Type == "1")//绌烘墭鐩�
- {
- skuNo = "100099";
- }
- }
- else //鍥炴祦鍏ュ簱
- {
- if (stockDetail.Count == 0)
- {
- throw new Exception($"{palletNo}鎵樼洏涓嶅瓨鍦ㄥ簱瀛樹俊鎭紝涓嶅彲鍏ュ簱锛�");
- }
- if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
- {
- throw new Exception("褰撳墠鎵樼洏宸插湪搴撳唴锛岃鏍稿疄");
- }
- skuNo = stockDetail.First().SkuNo;
- lotNo = stockDetail.First().LotNo;
-
- #region 鍒ゆ柇浠诲姟鏄惁宸茬粡瀛樺湪锛岃嫢瀛樺湪鐩存帴杩斿洖浠诲姟锛�
- var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0"
- && (m.Status == "0" || m.Status == "1") && m.PalletNo == palletNo && m.Type == "0");
- if (beingTask != null)
- {
- comDto = new OutCommandDto()
- {
- PalletNo = palletNo,//鎵樼洏鍙�
- StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
- StartLocate = beingTask.StartLocat, // 璧峰浣嶇疆
- EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
- EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
- TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
- TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
- OutMode = "", //鐩爣鍦板潃
- Order = 1
- };
- if (beingTask.IsSuccess == 0)
- {
- beingTask.IsSuccess = 1;
- beingTask.Status = "1";
- Db.Updateable(beingTask).ExecuteCommand();
- }
-
- return comDto;
- }
- #endregion
-
- #region 鍒ゆ柇璇ユ墭鐩橈紝鏄惁绗﹀悎鍥炲簱鍔熻兘璁惧畾鐨勫洖搴撹鍒�
- //鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
- var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0"
- && a.FunSetNo == "Fun041" && a.IsEnable == "NO");
- if (function != null)
- {
- //鎷ｈ揣瀹屾垚鍚庡厑璁告墭鐩樺洖搴�
- var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0"
- && a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);
-
- //楠岃瘉鎷ｈ揣鏄庣粏鏄惁瀛樺湪
- if (allot != null)
- {
- //楠岃瘉褰撳墠鎵樼洏鎷ｈ揣淇℃伅鏄惁宸插畬鎴�
- if (allot.Status != "5")
- {
- throw new Exception("褰撳墠鎵樼洏鎷ｈ揣淇℃伅鏈畬鎴愶紝璇峰畬鎴愬悗鍥炲簱锛�");
- }
- }
- }
- #endregion
- }
-
- var allotLocate = new AllotLocation();
-
- SysStorageLocat locate;
-
- #region 鏍规嵁sku纭鍖哄煙鍒掑垎
-
- //鐗╂枡淇℃伅
- var sku = Db.Queryable<SysMaterials>().First(m => m.IsDel == "0" && m.SkuNo == skuNo);
- if (sku == null)
- {
- throw new Exception("鐗╂枡缂栫爜涓嶅瓨鍦紝涓嶅彲鍏ュ簱");
- }
- //鍒ゆ柇鐗╂枡鏄惁鍚湁绫诲埆淇℃伅
- if (string.IsNullOrWhiteSpace(sku.CategoryNo))
- {
- throw new Exception($"鐗╂枡锛歿sku.SkuNo}鏈缃被鍒�,涓嶅彲鍏ュ簱");
- }
- //鐗╂枡绫诲埆淇℃伅
- var skuCategory = Db.Queryable<SysMaterialCategory>().First(m => m.IsDel == "0" && m.CategoryNo == sku.CategoryNo);
- if (skuCategory == null)
- {
- throw new Exception($"{sku.SkuNo}鐗╂枡绫诲埆涓嶅瓨鍦紝涓嶅彲鍏ュ簱");
- }
- //鏁寸悊鍖哄煙淇℃伅
- var areaStr = skuCategory.AreaNo.Split(",");
- var areaList = new List<string>();
- foreach (var item in areaStr)
- {
- areaList.Add(item);
- }
-
-
- var roadList = Db.Queryable<SysStorageLocat>().Where(m => m.WareHouseNo == houseNo && areaList.Contains(m.AreaNo))
- .GroupBy(m => m.RoadwayNo).OrderBy(m => m.RoadwayNo).Select(m => m.RoadwayNo).ToList();
-
-
- #endregion
-
- var roadNo = allotLocate.GetMiJiSuiTableRoad(houseNo, roadList, areaList,skuNo,lotNo);
-
- if (string.IsNullOrWhiteSpace(roadNo))
- {
- throw new Exception("鏈煡璇㈠埌瀛樺湪绌哄偍浣嶅贩閬�");
- }
-
- Db.BeginTran();
- try
- {
- //娣诲姞宸烽亾浣跨敤璁板綍
- var log = new SysRoadwayUseLog
- {
- RoadwayNo = roadNo,
- WareHouseNo = houseNo,
- Row = 0,
- Column = 0,
- Layer = 0,
- };
- Db.Insertable(log).ExecuteCommand();
-
- // 娣诲姞鍏ュ簱鏃ュ織璁板綍
- var taskNo = new Common().GetMaxNo("TK");
- var exTask = new LogTask //鍏ュ簱浠诲姟
- {
- TaskNo = taskNo,
- Sender = "WMS",
- Receiver = "WCS",
- IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
- SendDate = DateTime.Now, //鍙戦�佹椂闂�
- BackDate = DateTime.Now, //杩斿洖鏃堕棿
- StartRoadway = "", // 璧峰宸烽亾
- StartLocat = "",//璧峰浣嶇疆
- EndLocat = "",//鐩爣浣嶇疆
- EndRoadway = roadNo, // 鐩爣宸烽亾
- PalletNo = palletNo,//鎵樼洏鐮�
- IsSend = 1,//鏄惁鍙啀娆′笅鍙�
- IsCancel = 1,//鏄惁鍙彇娑�
- IsFinish = 1,//鏄惁鍙畬鎴�
- Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
- Status = "1",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
- OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
- Msg = "鍏ュ簱鍙ｅ埌=>>" + roadNo + "宸烽亾鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
-
- };
- Db.Insertable(exTask).ExecuteCommand();
-
- var asnNo = "";
- // 娣诲姞鎵樼洏缁戝畾琛ㄦ墭鐩樺叆搴撲换鍔″彿 liudl
- if (palletBindList.Count < 1)
- {
- 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);
- if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
- {
- bindModel.TaskNo = taskNo;
- bindModel.WareHouseNo = houseNo;
- bindModel.RoadwayNo = roadNo;
- Db.Updateable(bindModel).ExecuteCommand();
- asnNo = stockModel.ASNNo;
- }
-
-
- }
- }
- foreach (DataStockDetail stockModel in stockDetail)
- {
- //娣诲姞鎵樼洏涓婃灦璁板綍
- var upShelf = new BllPalletUpShelf()
- {
- TaskNo = exTask.TaskNo,
- TraceNo = asnNo,
- PalletNo = palletNo,
- SkuNo = stockModel.SkuNo,
- SkuName = stockModel.SkuName,
- LotNo = stockModel.LotNo,
- Status = "1",
-
- WareHouseNo = houseNo,
- RoadwayNo = roadNo,
- AreaNo = "",
- LocatNo = "",
-
- CreateUser = 0,
- };
- Db.Insertable(upShelf).ExecuteCommand();
- }
-
-
- if (palletBindList.Count >= 1)
- {
- foreach (var item in palletBindList)
- {
- item.WareHouseNo = houseNo;
- item.RoadwayNo = roadNo;
- item.TaskNo = taskNo;
- }
- Db.Updateable(palletBindList).ExecuteCommand();
- }
- Db.CommitTran();
-
- comDto = new OutCommandDto()
- {
- PalletNo = palletNo,//鎵樼洏鍙�
- StartRoadway = "",
- StartLocate = "", // 璧峰浣嶇疆
- EndLocate = "", // 鐩爣浣嶇疆
- EndRoadway = roadNo, // 鐩爣宸烽亾
- TaskNo = taskNo, // 浠诲姟鍙�
- TaskType = "0",// 浠诲姟绫诲瀷:鍏ュ簱浠诲姟
- OutMode = "", //鐩爣鍦板潃
- Order = 1
- };
- }
- catch (Exception ex)
- {
- Db.RollbackTran();
- throw new Exception(ex.Message);
- }
- #endregion
-
- return comDto;
- }
- catch (Exception e)
- {
- throw new Exception(e.Message);
- }
- }
/// <summary>
/// 鐢宠宸烽亾 锛堢珛浣撳簱锛�
@@ -2880,406 +3282,6 @@
}
}
- /// <summary>
- /// 1 鐢宠鍌ㄤ綅 2 鐢宠宸烽亾鍚� 鍐嶇敵璇峰偍浣嶅偍浣�
- /// </summary>
- /// <param name="palletNo"></param>
- /// <param name="houseNo"></param>
- /// <param name="roadwayNo"></param>
- /// <returns></returns>
- /// <exception cref="Exception"></exception>
- public OutCommandDto RequestLocation(string palletNo, string houseNo, string roadwayNo)
- {
- try
- {
- //楠岃瘉鎵樼洏鏉＄爜鏄惁涓虹┖
- if (string.IsNullOrEmpty(palletNo))
- {
- throw new Exception("璇疯緭鍏ヨ鐢宠鐨勬墭鐩樻潯鐮�");
- }
- //楠岃瘉鎵�灞炰粨搴撴槸鍚︿负绌�
- if (string.IsNullOrEmpty(houseNo))
- {
- throw new Exception("璇烽�夋嫨鎵�灞炰粨搴�");
- }
- //楠岃瘉鏄惁涓哄钩搴撳叆搴�
- if (houseNo == "W02")
- {
- throw new Exception("骞冲簱璇蜂娇鐢≒DA鎵嬫寔杩涜骞冲簱鍏ュ簱");
- }
-
- OutCommandDto comDto;//杩斿洖wcs鐨勫叆搴撳懡浠�
- var isHaveLocateNo = false; //鎵樼洏缁戝畾淇℃伅涓槸鍚﹀凡鏈夋寚瀹氬偍浣�
-
- var stock = Db.Queryable<SysPallets>().First(a => a.PalletNo == palletNo);//鎵樼洏淇℃伅
-
- //鍒ゆ柇鎵樼洏鏉＄爜鏄惁鏈夋晥
- if (stock == null)
- throw new Exception("鎵樼洏鏉＄爜涓嶅彈WMS绠＄悊锛屼笉鍙叆搴擄紒");
-
- #region
-
- //鏌ヨ鎵樼洏缁戝畾淇℃伅(鐘舵�佷负绛夊緟鍏ュ簱鐨�)
- var palletBindList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && (m.Status == "0" || m.Status == "1")).ToList();
- var haveLocate = palletBindList.FirstOrDefault(m => !string.IsNullOrWhiteSpace(m.LocatNo));
-
- var skuList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();
- //鐗╂枡绫诲埆淇℃伅
- var skuCategoryList = Db.Queryable<SysMaterialCategory>().Where(m => m.IsDel == "0").ToList();
-
- var skuNo = ""; //鍏ュ簱鐗╂枡
- var isAddTask = true; //鏄惁娣诲姞鏂颁换鍔�
- var oldTaskNo = ""; //鏃т换鍔″彿
- var stockDetail = Db.Queryable<DataStockDetail>().Where(m => m.PalletNo == palletNo).ToList();
- if (palletBindList.Count >= 1) //姝ｅ父鍏ュ簱
- {
- var palletBind = palletBindList.FirstOrDefault(m => m.Status == "1");
- if (palletBind != null)
- {
- var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == palletBind.TaskNo);
- if (beingTask == null)
- {
- throw new Exception("璇ユ墭鐩樻鍦ㄥ叆搴擄紝浣嗘湭鏌ヨ鍒颁换鍔′俊鎭�");
- }
- if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
- {
- comDto = new OutCommandDto()
- {
- PalletNo = palletNo,//鎵樼洏鍙�
- StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
- StartLocate = "", // 璧峰浣嶇疆
- EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
- EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
- TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
- TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
- OutMode = "", //鐩爣鍦板潃
- Order = 1
- };
- if (beingTask.IsSuccess == 0)
- {
- beingTask.IsSuccess = 1;
- Db.Updateable(beingTask).ExecuteCommand();
- }
- return comDto;
- }
- else
- {
- if (string.IsNullOrWhiteSpace(roadwayNo))
- {
- roadwayNo = beingTask.EndRoadway;
- }
- isAddTask = false;
- oldTaskNo = beingTask.TaskNo;
- }
- }
- if (haveLocate != null)
- {
- isHaveLocateNo = true; //宸叉湁鎸囧畾鍌ㄤ綅
- }
-
- if (palletBindList.First().Type == "0") //鐗╂枡鎵樺叆搴�
- {
- //鍒ゆ柇鏄惁缁戝畾鍗曟嵁鍙婂崟鎹姸鎬佹槸鍚︽甯�
- foreach (var item in palletBindList)
- {
- var notice = Db.Queryable<BllArrivalNotice>().First(m => m.IsDel == "0" && m.ASNNo == item.ASNNo);
- if (notice == null)
- {
- throw new Exception("鎵樼洏瀛樺湪鐗╂枡鏈粦瀹氬叆搴撳崟锛屼笉鍙叆搴擄紒");
- }
- if (notice.Status == "3")
- {
- throw new Exception($"鍏ュ簱鍗晎item.ASNNo}宸插叧闂紝涓嶅彲鍏ュ簱锛�");
- }
- }
-
- //鑾峰彇鐗╂枡瀛樻斁鍖哄煙
- var noticeDetail = Db.Queryable<BllArrivalNoticeDetail>().First(m =>
- m.IsDel == "0" && m.Id == palletBindList.First().ASNDetailNo);
- if (noticeDetail == null)
- {
- throw new Exception("鎵樼洏瀛樺湪鐗╂枡鏈粦瀹氬叆搴撳崟鏄庣粏锛屼笉鍙叆搴�");
- }
-
- skuNo = noticeDetail.SkuNo;
-
- }
- else if (palletBindList.First().Type == "1")//绌烘墭鐩�
- {
- skuNo = "100099";
- }
- }
- else //鍥炴祦鍏ュ簱
- {
- if (stockDetail.Count == 0)
- {
- throw new Exception($"{palletNo}鎵樼洏鏉＄爜涓嶅叿鏈夌鐮佷俊鎭紝涓嶅彲鍏ュ簱锛�");
- }
- if (stockDetail.Count(m => !string.IsNullOrWhiteSpace(m.LocatNo)) > 0)
- {
- throw new Exception("褰撳墠鎵樼洏宸插湪搴撳唴锛岃鏍稿疄");
- }
- skuNo = stockDetail.First().SkuNo;
-
- var beingTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0"
- && (m.Status == "0" || m.Status == "1") && m.PalletNo == palletNo && m.Type == "0");
- if (beingTask != null)
- {
- if (!string.IsNullOrWhiteSpace(beingTask.EndLocat))
- {
- comDto = new OutCommandDto()
- {
- PalletNo = palletNo,//鎵樼洏鍙�
- StartRoadway = beingTask.StartRoadway, // 璧峰宸烽亾
- StartLocate = "", // 璧峰浣嶇疆
- EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
- EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
- TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
- TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
- OutMode = "", //鐩爣鍦板潃
- Order = 1
- };
- if (beingTask.IsSuccess == 0)
- {
- beingTask.IsSuccess = 1;
- beingTask.Status = "1";
- Db.Updateable(beingTask).ExecuteCommand();
- }
- return comDto;
- }
- else
- {
- if (string.IsNullOrWhiteSpace(roadwayNo))
- {
- roadwayNo = beingTask.EndRoadway;
- }
- isAddTask = false;
- oldTaskNo = beingTask.TaskNo;
- }
- }
-
- //鑾峰彇瀵瑰簲鍥炲簱瑙勫垯
- var function = Db.Queryable<SysFunSetting>().First(a => a.IsDel == "0" && a.FunSetName == "鎵樼洏鍥炲簱楠岃瘉" && a.IsEnable == "NO");
- #region 鎵樼洏鍥炲簱瑙勫垯
-
- if (function != null)
- {
- //鎷ｈ揣瀹屾垚鍚庡厑璁告墭鐩樺洖搴�
- if (function.SetValue == "CompletePick")
- {
- var allot = Db.Queryable<BllExportAllot>().First(a => a.IsDel == "0" && a.LotNo == stockDetail[0].LotNo && a.PalletNo == palletNo && a.SkuNo == stockDetail[0].SkuNo);
-
- //楠岃瘉鎷ｈ揣鏄庣粏鏄惁瀛樺湪
- if (allot != null)
- {
- //楠岃瘉褰撳墠鎵樼洏鎷ｈ揣淇℃伅鏄惁宸插畬鎴�
- if (allot.Status != "5")
- {
- throw new Exception("褰撳墠鎵樼洏鎷ｈ揣淇℃伅鏈畬鎴愶紝璇峰畬鎴愬悗鍥炲簱锛�");
- }
- }
- }
- }
- #endregion
- }
-
- var allotLocate = new AllotLocation();
-
- #region 鐢宠鍌ㄤ綅
-
- SysStorageLocat locate;
- if (isHaveLocateNo) //鎸囧畾鍌ㄤ綅
- {
- locate = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == haveLocate.LocatNo);
- }
- else
- {
- var sku = skuList.FirstOrDefault(m => m.SkuNo == skuNo);
- if (sku == null)
- {
- throw new Exception("鐗╂枡淇℃伅涓湭鏌ヨ鍒板叆搴撳崟鏄庣粏鍖呭惈鐨勭墿鏂欎俊鎭紝涓嶅彲鍏ュ簱");
- }
- //鍒ゆ柇鐗╂枡鏄惁鍚湁绫诲埆淇℃伅
- if (string.IsNullOrWhiteSpace(sku.CategoryNo))
- {
- throw new Exception($"鐗╂枡锛歿sku.SkuNo}鏈煡璇㈠埌绫诲埆淇℃伅");
- }
-
- var skuCategory = skuCategoryList.FirstOrDefault(m => m.CategoryNo == sku.CategoryNo);
- if (skuCategory == null)
- {
- throw new Exception($"鏈湪绫诲埆淇℃伅涓煡璇㈠埌鐗╂枡锛歿sku.SkuNo}鍖呭惈鐨勭被鍒�");
- }
-
- var areaStr = skuCategory.AreaNo.Split(",");
- var areaList = new List<string>();
- foreach (var item in areaStr)
- {
- areaList.Add(item);
- }
-
- locate = allotLocate.GetSuiTableLocate(houseNo, areaList, roadwayNo);
- }
-
- #endregion
-
- Db.BeginTran();
- try
- {
-
- if (isAddTask) // 姝ｅ父鍏ュ簱
- {
- var taskNo = new Common().GetMaxNo("TK");
- var exTask = new LogTask //鍏ュ簱浠诲姟
- {
- TaskNo = taskNo,
- Sender = "WMS",
- Receiver = "WCS",
- IsSuccess = 1, //鏄惁涓嬪彂鎴愬姛 0澶辫触 1鎴愬姛
- SendDate = DateTime.Now, //鍙戦�佹椂闂�
- BackDate = DateTime.Now, //杩斿洖鏃堕棿
- StartRoadway = "", // 璧峰宸烽亾
- StartLocat = "",//璧峰浣嶇疆
- EndLocat = locate.LocatNo,//鐩爣浣嶇疆
- EndRoadway = locate.RoadwayNo, // 鐩爣宸烽亾
- PalletNo = palletNo,//鎵樼洏鐮�
- IsSend = 1,//鏄惁鍙啀娆′笅鍙�
- IsCancel = 1,//鏄惁鍙彇娑�
- IsFinish = 1,//鏄惁鍙畬鎴�
- Type = "0",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
- Status = "1",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
- OrderType = "0",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
- Msg = "鍏ュ簱鍙ｅ埌=>>" + locate.LocatNo + "鐨勫叆搴撲换鍔�", //鍏抽敭淇℃伅
-
- };
- Db.Insertable(exTask).ExecuteCommand();
- var asnNo = "";
- // 娣诲姞鎵樼洏缁戝畾琛ㄦ墭鐩樺叆搴撲换鍔″彿 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);
- if (bindModel != null && string.IsNullOrWhiteSpace(bindModel.TaskNo))
- {
- bindModel.TaskNo = taskNo;
- bindModel.WareHouseNo = locate.WareHouseNo;
- bindModel.RoadwayNo = locate.RoadwayNo;
- bindModel.LocatNo = locate.LocatNo;
- Db.Updateable(bindModel).ExecuteCommand();
- asnNo = stockModel.ASNNo;
- }
- }
- foreach (DataStockDetail stockModel in stockDetail)
- {
- //娣诲姞鎵樼洏涓婃灦璁板綍
- var upShelf = new BllPalletUpShelf()
- {
- TaskNo = exTask.TaskNo,
- TraceNo = asnNo,
- PalletNo = palletNo,
- SkuNo = stockModel.SkuNo,
- SkuName = stockModel.SkuName,
- LotNo = stockModel.LotNo,
- Status = "1",
-
- WareHouseNo = houseNo,
- RoadwayNo = locate.RoadwayNo,
- AreaNo = locate.AreaNo,
- LocatNo = locate.LocatNo,
-
- CreateUser = 0,
- };
- Db.Insertable(upShelf).ExecuteCommand();
- }
-
- oldTaskNo = taskNo;
- }
- else
- {
- var oldTask = Db.Queryable<LogTask>().First(m => m.IsDel == "0" && m.TaskNo == oldTaskNo);
- oldTask.EndLocat = locate.LocatNo;
- oldTask.EndRoadway = locate.RoadwayNo;
- if (oldTask.IsSuccess == 0)
- {
- oldTask.IsSuccess = 1;
- oldTask.Status = "1";
- }
- Db.Updateable(oldTask).ExecuteCommand();
-
-
- var bindModelList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.Status == "2"
- && m.PalletNo == oldTask.PalletNo && m.TaskNo == oldTaskNo).ToList();
- foreach (var bindModel in bindModelList)
- {
- if (string.IsNullOrWhiteSpace(bindModel.LocatNo))
- {
- bindModel.TaskNo = oldTask.TaskNo;
- bindModel.WareHouseNo = locate.WareHouseNo;
- bindModel.RoadwayNo = locate.RoadwayNo;
- bindModel.LocatNo = locate.LocatNo;
- Db.Updateable(bindModel).ExecuteCommand();
-
- }
- }
- //鏇存敼涓婃灦淇℃伅
- var upShelfList = Db.Queryable<BllPalletUpShelf>().Where(m => m.IsDel == "0" && m.TaskNo == oldTask.TaskNo && m.PalletNo == palletNo).ToList();
- foreach (var upShelf in upShelfList)
- {
- upShelf.WareHouseNo = locate.WareHouseNo;
- upShelf.RoadwayNo = locate.RoadwayNo;
- upShelf.LocatNo = locate.LocatNo;
- upShelf.Status = "1";
- Db.Updateable(upShelf).ExecuteCommand();
-
- }
-
-
- }
-
- locate.Status = "2";
- Db.Updateable(locate).ExecuteCommand();
- if (palletBindList.Count >= 1)
- {
- foreach (var item in palletBindList)
- {
- item.Status = "1";
- item.WareHouseNo = locate.WareHouseNo;
- item.RoadwayNo = locate.RoadwayNo;
- item.LocatNo = locate.LocatNo;
- item.TaskNo = oldTaskNo;
- }
- Db.Updateable(palletBindList).ExecuteCommand();
- }
- Db.CommitTran();
- comDto = new OutCommandDto()
- {
- PalletNo = palletNo,//鎵樼洏鍙�
- StartRoadway = "",
- StartLocate = "", // 璧峰浣嶇疆
- EndLocate = locate.LocatNo, // 鐩爣浣嶇疆
- EndRoadway = locate.RoadwayNo, // 鐩爣宸烽亾
- TaskNo = oldTaskNo, // 浠诲姟鍙�
- TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
- OutMode = "", //鐩爣鍦板潃
- Order = 1
- };
-
- }
- catch (Exception ex)
- {
- Db.RollbackTran();
- throw new Exception(ex.Message);
- }
- #endregion
-
-
- return comDto;
- }
- catch (Exception e)
- {
- throw new Exception(e.Message);
- }
- }
/// <summary>
/// 鍏ュ簱瀹屾垚(wcs鍙嶉銆亀ms鎵嬪姩瀹屾垚)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 512b2d9..3b9a7d0 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -1797,21 +1797,22 @@
foreach (var s in stockDetail)
{
//鑾峰彇鍌ㄤ綅淇℃伅
- var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && l.WareHouseNo == "W01");
+ var locat = await Db.Queryable<SysStorageLocat>().FirstAsync(l => l.LocatNo == s.LocatNo && l.IsDel == "0" && l.WareHouseNo == "W02");
- if (locat != null)
+ if (locat == null)
{
- if (locat.Status != "1")
- {
- continue;
- }
- //鏇存敼鍌ㄤ綅鐘舵�佷负鍑哄簱涓�
- locat.Status = "3"; //3 鍑哄簱涓�
- locat.UpdateTime = serverTime; //淇敼鏃堕棿
- locat.UpdateUser = userId; //淇敼浜�
- //淇敼鍌ㄤ綅淇℃伅
- await Db.Updateable(locat).ExecuteCommandAsync();
+ throw new Exception("鍌ㄤ綅涓婃病鏈夌┖鎵樼洏璺�");
}
+ if (locat.Status != "1")
+ {
+ continue;
+ }
+ //鏇存敼鍌ㄤ綅鐘舵�佷负鍑哄簱涓�
+ locat.Status = "3"; //3 鍑哄簱涓�
+ locat.UpdateTime = serverTime; //淇敼鏃堕棿
+ locat.UpdateUser = userId; //淇敼浜�
+ //淇敼鍌ㄤ綅淇℃伅
+ await Db.Updateable(locat).ExecuteCommandAsync();
//澧炲姞搴撳瓨閿佸畾鏁伴噺
//stock.AllotQty +=
@@ -1897,7 +1898,8 @@
TaskNo = exTask.TaskNo, // 浠诲姟鍙�
TaskType = "1",// 浠诲姟绫诲瀷 (鍑哄簱)
OutMode = model.OutMode, //鐩爣鍦板潃
- Order = 1
+ Order = 1,
+ Type = PLCTypeEnum.AGV
});
await Db.Insertable(exTask).ExecuteCommandAsync();
@@ -1952,13 +1954,13 @@
var k = new OperationSOServer().AddLogOperationSo("PDA妯″潡", "绌烘墭鍑哄簱", i + "", "涓嬪彂", $"鐢≒DA涓嬪彂浜� {i} 涓┖鎵樺灈", userId);
Db.CommitTran();
- return "";
+ return "鎴愬姛";
}
catch (Exception e)
{
Db.RollbackTran();
- return "";
+ return e.Message;
}
}
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 398927b..88bb8bb 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -3347,7 +3347,8 @@
#endregion
var com = new Common();
-
+ var allot = new AllotLocation();
+
var notice = Db.Queryable<BllExportNotice>().First(m => m.SONo == soNo && m.IsDel == "0");
if (notice == null)
{
@@ -3524,10 +3525,11 @@
PalletNo = item.PalletNo,//鎵樼洏鍙�
StartLocate = locate.LocatNo, // 璧峰浣嶇疆
StartRoadway = locate.RoadwayNo,//鍏跺疄宸烽亾
- EndLocate = toLocation,//outMode, // 鐩爣浣嶇疆
+ EndLocate = moveAddress,//outMode, // 鐩爣浣嶇疆
TaskNo = ykTaskNo, // 浠诲姟鍙�
- TaskType = "1",// 浠诲姟绫诲瀷 (鍑哄簱)0鍏� 1鍑� 2绉�
+ TaskType = "2",// 浠诲姟绫诲瀷 (鍑哄簱)0鍏� 1鍑� 2绉�
Order = Math.Abs(row2 - rows),
+ Type = PLCTypeEnum.ShuttleCar
});
var slotChange = Db.Queryable<SysStorageLocat>().First(m => m.LocatNo == s);
@@ -3573,17 +3575,19 @@
};
Db.Insertable(exTask).ExecuteCommand();
logTaskList.Add(exTask);
-
+ var endroad = allot.RoadwayToStationNum(locate.RoadwayNo, toLocation);
outDto1.Add(new OutCommandDto()
{
PalletNo = item.PalletNo,//鎵樼洏鍙�
StartLocate = locate.LocatNo, // 璧峰浣嶇疆
- StartRoadway = locate.RoadwayNo,//鍏跺疄宸烽亾
- EndLocate = toLocation,//outMode, // 鐩爣浣嶇疆
+ StartRoadway = locate.RoadwayNo,//璧峰宸烽亾
+ EndLocate = outMode,//, // 鐩爣浣嶇疆
+ EndRoadway = endroad,
TaskNo = exTask.TaskNo, // 浠诲姟鍙�
TaskType = "1",// 浠诲姟绫诲瀷 (鍑哄簱)0鍏� 1鍑� 2绉�
- OutMode = toLocation, //鍑哄簱鍙�
+ OutMode = outMode, //鍑哄簱鍙�
Order = Math.Abs(row2 - row1),
+ Type = PLCTypeEnum.ShuttleCar
});
taskNoStr = exTask.TaskNo;
diff --git a/Wms/WMS.BLL/Logic/AllotLocation.cs b/Wms/WMS.BLL/Logic/AllotLocation.cs
index 8d1ca0a..4b4aff6 100644
--- a/Wms/WMS.BLL/Logic/AllotLocation.cs
+++ b/Wms/WMS.BLL/Logic/AllotLocation.cs
@@ -105,16 +105,16 @@
/// <param name="areaList">鍖哄煙闆嗗悎</param>
/// <param name="lotNo">鎵规鍙�</param>
/// <returns></returns>
- public SysStorageLocat GetMiJiSuiTableLocate(SysStorageRoadway roadway, List<string> areaList, string sku, string lotNo = "")
+ public SysStorageLocat GetMiJiSuiTableLocate(string roadwayNo, List<string> areaList)
{
var db = DataContext.Db;
// 鍒ゆ柇褰撳墠宸烽亾(缁�)鏄惁鏈夌┖浣欏偍浣�
- var locateList = db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.RoadwayNo == roadway.RoadwayNo && areaList.Contains(m.AreaNo)).ToList();
+ var locateList = db.Queryable<SysStorageLocat>().Where(m => m.IsDel == "0" && m.RoadwayNo == roadwayNo && areaList.Contains(m.AreaNo)).ToList();
if (locateList.Count(m => m.Status == "0") > 0)
{
- var bl = GetLocateASCOrDesc(roadway.RoadwayNo);
+ var bl = GetLocateASCOrDesc(roadwayNo);
var locate = locateList.OrderBy(m => m.LocatNo).First();
@@ -191,6 +191,102 @@
}
/// <summary>
+ /// 鏍规嵁璧峰缁勮幏鍙栦綅缃渶浼樼殑鍥涢」杞﹀彇璐у伐浣�
+ /// </summary>
+ /// <param name="straRoadway">璧峰缁�</param>
+ /// <param name="outModel">鍑哄簱鍙ｅ伐浣� 9銆� 17銆� 18</param>
+ /// <returns></returns>
+ public string RoadwayToStationNum(string straRoadway, string outModel)
+ {
+ var db = DataContext.Db;
+ string stationNum = "";
+
+ string[] lists = straRoadway.Split("MR");
+ var model = db.Queryable<SysStorageLocat>().First(m => m.RoadwayNo == straRoadway && m.IsDel == "0");
+ string stat = model.AisleOne;
+
+ if (model.Layer == 1)
+ { // 涓�灞�
+ switch (outModel) // 鐢宠鐨勫叆搴撳彛
+ {
+ case "9":
+
+ var path13 = Math.Abs(19 - int.Parse(stat.Substring(0, 2))) + Math.Abs(6 - int.Parse(stat.Substring(2, 2)));
+ var path14 = Math.Abs(19 - int.Parse(stat.Substring(0, 2))) + Math.Abs(12 - int.Parse(stat.Substring(2, 2)));
+
+ if (path13 <= path14)
+ {
+ stationNum = "190601";
+ }
+ else
+ {
+ stationNum = "191201";
+ }
+ break;
+ case "17":
+ stationNum = "030401";
+ break;
+ case "18":
+ var path03 = Math.Abs(03 - int.Parse(stat.Substring(0, 2))) + Math.Abs(06 - int.Parse(stat.Substring(2, 2)));
+ var path05 = Math.Abs(03 - int.Parse(stat.Substring(0, 2))) + Math.Abs(12 - int.Parse(stat.Substring(2, 2)));
+
+ if (path03 <= path05)
+ {
+ stationNum = "030601";
+ }
+ else
+ {
+ stationNum = "031201";
+ }
+ break;
+ default: break;
+ }
+ }
+ else
+ { // 浜屽眰
+ switch (outModel) // 鐢宠鐨勫叆搴撳彛
+ {
+ case "9":
+
+ var path15 = Math.Abs(19 - int.Parse(stat.Substring(0, 2))) + Math.Abs(6 - int.Parse(stat.Substring(2, 2)));
+ var path16 = Math.Abs(19 - int.Parse(stat.Substring(0, 2))) + Math.Abs(12 - int.Parse(stat.Substring(2, 2)));
+
+ if (path15 <= path16)
+ {
+ stationNum = "190602";
+ }
+ else
+ {
+ stationNum = "191202";
+ }
+
+ break;
+ case "17":
+ stationNum = "030402";
+ break;
+ case "18":
+ var path03 = Math.Abs(03 - int.Parse(stat.Substring(0, 2))) + Math.Abs(06 - int.Parse(stat.Substring(2, 2)));
+ var path05 = Math.Abs(03 - int.Parse(stat.Substring(0, 2))) + Math.Abs(12 - int.Parse(stat.Substring(2, 2)));
+
+ if (path03 <= path05)
+ {
+ stationNum = "030602";
+ }
+ else
+ {
+ stationNum = "031202";
+ }
+
+ break;
+ default: break;
+ }
+ }
+
+ return stationNum;
+ }
+
+
+ /// <summary>
/// 鑾峰彇鍚堥�傜殑搴撲綅
/// </summary>
/// <param name="houseNo">浠撳簱鍙�</param>
diff --git a/Wms/WMS.BLL/SysServer/MaterialsServer.cs b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
index 5554355..9ba5182 100644
--- a/Wms/WMS.BLL/SysServer/MaterialsServer.cs
+++ b/Wms/WMS.BLL/SysServer/MaterialsServer.cs
@@ -55,12 +55,12 @@
/// <returns></returns>
public Task<List<MaterialsDto>> GetMateList(string skuNo, string skuName, string auditStatusNo, string type, string isControlled, string isInspect, string environment, string categoryNo)
{
- return Db.Queryable<SysMaterials>()
+ var DA = Db.Queryable<SysMaterials>()
.LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
.LeftJoin<SysPackag>((a, b,c) => a.PackagNo == c.PackagNo)
- .LeftJoin<SysUnit> ((a,b,c,d)=>a.UnitNo == d.UnitNo)
- .LeftJoin<SysMaterialCategory>((a,b,c,d,e)=>a.CategoryNo == e.CategoryNo)
- .Where((a,b,c,d,e) => d.IsDel == "0" && e.IsDel =="0")
+ //.LeftJoin<SysUnit> ((a,b,c,d)=>a.UnitNo == d.UnitNo)
+ .LeftJoin<SysMaterialCategory>((a,b,c,d)=>a.CategoryNo == d.CategoryNo)
+ .Where((a,b,c,d) => a.IsDel == "0" && d.IsDel == "0" )
.WhereIF(!string.IsNullOrEmpty(skuNo), a => a.SkuNo.Contains(skuNo))
.WhereIF(!string.IsNullOrEmpty(skuName), a => a.SkuName.Contains(skuName))
.WhereIF(!string.IsNullOrEmpty(auditStatusNo), a => a.AuditStatusNo == auditStatusNo)
@@ -69,9 +69,9 @@
.WhereIF(!string.IsNullOrEmpty(isInspect), a => a.IsInspect == isInspect)
.WhereIF(!string.IsNullOrEmpty(environment), a => a.Environment == environment)
.WhereIF(!string.IsNullOrEmpty(categoryNo), a => a.CategoryNo == categoryNo)
- .Where(a => a.IsDel == "0" )
- .Select<MaterialsDto>((a, b, c,d,e) => new MaterialsDto() { CreateUserName = b.RealName,PackagName = c.PackagName }, true)
+ .Select<MaterialsDto>((a, b, c,d) => new MaterialsDto() { CreateUserName = b.RealName,PackagName = c.PackagName }, true)
.ToListAsync();
+ return DA;
}
/// <summary>
diff --git a/Wms/WMS.IBLL/IBllAsnServer/IPalletBindServer.cs b/Wms/WMS.IBLL/IBllAsnServer/IPalletBindServer.cs
index 5a21c4d..d69ac6d 100644
--- a/Wms/WMS.IBLL/IBllAsnServer/IPalletBindServer.cs
+++ b/Wms/WMS.IBLL/IBllAsnServer/IPalletBindServer.cs
@@ -100,7 +100,7 @@
/// <param name="palletNo">鎵樼洏鍙�</param>
/// <param name="houseNo">浠撳簱鍙�</param>
/// <returns></returns>
- OutCommandDto RequestRoadWay(string palletNo, string houseNo);
+ OutCommandDto RequestMiJiRoadWay(string palletNo, string houseNo);
/// <summary>
/// 鐢宠绌哄偍浣�
/// </summary>
@@ -108,7 +108,7 @@
/// <param name="houseNo">浠撳簱鍙�</param>
/// <param name="roadwayNo">宸烽亾鍙�</param>
/// <returns></returns>
- OutCommandDto RequestLocation(string palletNo, string houseNo, string roadwayNo);
+ OutCommandDto RequestMiJiLocation(string palletNo, string houseNo, string roadwayNo);
/// <summary>
/// 鍏ュ簱瀹屾垚
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 210aeea..37f083b 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -20,6 +20,7 @@
using System.Threading.Tasks;
using Model.ModelVm.BllCheckVm;
using System.Collections.Generic;
+using System.Security.Policy;
namespace Wms.Controllers
{
@@ -276,32 +277,32 @@
/// </summary>
/// <param name="model">鍏ュ簱鍗曚俊鎭�</param>
/// <returns></returns>
- [AllowAnonymous]
- [HttpPost]
- public IActionResult BindRequestRoadWay(BoxPalletBindVm model)
- {
- var logStr = $@".\log\WCS\WCS鎵樼洏缁戝畾-鐢宠宸烽亾" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ //[AllowAnonymous]
+ //[HttpPost]
+ //public IActionResult BindRequestRoadWay(BoxPalletBindVm model)
+ //{
+ // var logStr = $@".\log\WCS\WCS鎵樼洏缁戝畾-鐢宠宸烽亾" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
- try
- {
+ // try
+ // {
- var jsonData = JsonConvert.SerializeObject(model);
- LogFile.SaveLogToFile($"WCS鎵樼洏缁戝畾-鐢宠宸烽亾锛�( {jsonData} ),", logStr);
+ // var jsonData = JsonConvert.SerializeObject(model);
+ // LogFile.SaveLogToFile($"WCS鎵樼洏缁戝畾-鐢宠宸烽亾锛�( {jsonData} ),", logStr);
- _asnPalletBindSvc.BindPalletStock(model, 0);
- //鐢宠宸烽亾
- var list = _asnPalletBindSvc.RequestRoadWay(model.PalletNo, "W01");
- LogFile.SaveLogToFile($"WCS鎵樼洏缁戝畾-鐢宠宸烽亾杩斿洖锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
+ // _asnPalletBindSvc.BindPalletStock(model, 0);
+ // //鐢宠宸烽亾
+ // var list = _asnPalletBindSvc.RequestRoadWay(model.PalletNo, "W01");
+ // LogFile.SaveLogToFile($"WCS鎵樼洏缁戝畾-鐢宠宸烽亾杩斿洖锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
- return Ok(new { Success = 0, Message = "鎵樼洏缁戝畾-鐢宠宸烽亾鎴愬姛", TaskList = list });
- }
- catch (Exception e)
- {
- LogFile.SaveLogToFile($"WCS鎵樼洏缁戝畾-鐢宠宸烽亾杩斿洖锛�( {e.Message} ),", logStr);
+ // return Ok(new { Success = 0, Message = "鎵樼洏缁戝畾-鐢宠宸烽亾鎴愬姛", TaskList = list });
+ // }
+ // catch (Exception e)
+ // {
+ // LogFile.SaveLogToFile($"WCS鎵樼洏缁戝畾-鐢宠宸烽亾杩斿洖锛�( {e.Message} ),", logStr);
- return Ok(new ErpModel { Success = -1, Message = e.Message });
- }
- }
+ // return Ok(new ErpModel { Success = -1, Message = e.Message });
+ // }
+ //}
/// <summary>
/// PDA 浜哄伐鐢宠鍌ㄤ綅 锛堢珛浣撳簱锛�
@@ -350,7 +351,7 @@
/// <returns></returns>
[AllowAnonymous]
[HttpPost]
- public IActionResult RequestRoadWay(RequestLocate model)
+ public IActionResult RequestMiJiRoadWay(RequestLocate model)
{
var logStr = "";
@@ -362,7 +363,7 @@
var jsonData = JsonConvert.SerializeObject(model);
LogFile.SaveLogToFile($"WCS鐢宠宸烽亾锛�( {jsonData} ),", logStr);
- var list = _asnPalletBindSvc.RequestRoadWay(model.PalletNo, model.HouseNo);
+ var list = _asnPalletBindSvc.RequestMiJiRoadWay(model.PalletNo, model.HouseNo);
LogFile.SaveLogToFile($"WCS鐢宠宸烽亾杩斿洖锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
//new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo.Substring(0, 8),
@@ -404,59 +405,29 @@
//string palletno = model.PalletNo;
var logStr = "";
- if (model.PalletNo.Length == 9)
- {
- logStr = $@".\log\WCS\WMS鐢宠鍌ㄤ綅" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
- }
- else if (model.PalletNo.Length == 8)
- {
- logStr = $@".\log\WCS\WCS鐢宠鍌ㄤ綅" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
- }
+
+ logStr = $@".\log\WCS\WCS鐢宠鍌ㄤ綅" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+
try
{
- if (model.PalletNo.Length == 9)
- {
- var jsonData = JsonConvert.SerializeObject(model);
- LogFile.SaveLogToFile($"WMS鐢宠鍌ㄤ綅锛�( {jsonData} ),", logStr);
- }
- else if (model.PalletNo.Length == 8)
- {
- var jsonData = JsonConvert.SerializeObject(model);
- LogFile.SaveLogToFile($"WCS鐢宠鍌ㄤ綅锛�( {jsonData} ),", logStr);
- }
-
+
+ var jsonData = JsonConvert.SerializeObject(model);
+ LogFile.SaveLogToFile($"WCS鐢宠鍌ㄤ綅锛�( {jsonData} ),", logStr);
+
string pallet = model.PalletNo.Substring(0, 8);
- var list = _asnPalletBindSvc.RequestLocation(pallet, model.HouseNo, model.RoadwayNo);
+ var list = _asnPalletBindSvc.RequestMiJiLocation(pallet, model.HouseNo, model.RoadwayNo);
- if (model.PalletNo.Length == 9)
- {
- new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo.Substring(0, 8), "鐢宠鍌ㄤ綅", $"鐢宠鍌ㄤ綅鎵樼洏鍙凤細{model.PalletNo.Substring(0, 8)}鐨勬垚鍔熶俊鎭�", 2);// int.Parse(userId)
- LogFile.SaveLogToFile($"WMS鐢宠鍌ㄤ綅鎴愬姛锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
- }
- else if (model.PalletNo.Length == 8)
- {
- LogFile.SaveLogToFile($"WCS鐢宠鍌ㄤ綅杩斿洖锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
- }
- if (model.PalletNo.Length == 9)
- {
-
- }
-
+ LogFile.SaveLogToFile($"WCS鐢宠鍌ㄤ綅杩斿洖锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
+ //new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo.Substring(0, 8), "鐢宠鍌ㄤ綅", $"鐢宠鍌ㄤ綅鎵樼洏鍙凤細{model.PalletNo.Substring(0, 8)}鐨勬垚鍔熶俊鎭�", 2);// int.Parse(userId)
+ //LogFile.SaveLogToFile($"WMS鐢宠鍌ㄤ綅鎴愬姛锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
+
return Ok(new { Success = 0, Message = "鐢宠鍌ㄤ綅鎴愬姛", TaskList = list });
}
catch (Exception e)
{
- if (model.PalletNo.Length == 9)
- {
- new OperationASNServer().AddLogOperationAsn("鍏ュ簱浣滀笟", "鍏ュ簱鏃ュ織", model.PalletNo.Substring(0, 8), "鐢宠鍌ㄤ綅", $"鐢宠鍌ㄤ綅鎵樼洏鍙凤細{model.PalletNo.Substring(0, 8)}鐨勫け璐ヤ俊鎭�", 2);//int.Parse(userId)
- LogFile.SaveLogToFile($"WMS鐢宠鍌ㄤ綅澶辫触杩斿洖锛�( {e.Message} ),", logStr);
- }
- else if (model.PalletNo.Length == 8)
- {
- LogFile.SaveLogToFile($"WCS鐢宠鍌ㄤ綅杩斿洖锛�( {e.Message} ),", logStr);
- }
-
+ LogFile.SaveLogToFile($"WCS鐢宠鍌ㄤ綅杩斿洖锛�( {e.Message} ),", logStr);
+
return Ok(new ErpModel { Success = -1, Message = e.Message });
}
}
@@ -742,5 +713,39 @@
#endregion
+ /// <summary>
+ /// PDA 浜哄伐鐢宠鍌ㄤ綅 锛堢珛浣撳簱锛�
+ /// </summary>
+ /// <param name="model">鍏ュ簱鍗曚俊鎭�</param>
+ /// <returns></returns>
+ [AllowAnonymous]
+ [HttpPost]
+ public IActionResult ceshiapi()
+ {
+ try
+ {
+ var url = "https://10.26.200.25/rcs/rtas/api/robot/controller/carrier/unbind";
+
+ var requestId = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString();
+ var dic = new Dictionary<string, string>()
+ {
+ {"X-lr-request-id",requestId },
+ {"X-lr-version","4.2" },
+ };
+ var mod = new
+ {
+ carrierCode = "palletNo",
+ siteCode = "locateNo"
+ };
+ var jsonData = JsonConvert.SerializeObject(mod);
+ HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV瑙ｇ粦", "AGV",dic);
+
+ return Ok(new HttpReturnModel { Success = "0", Message = "鐢宠鍌ㄤ綅鎴愬姛", Data = "list" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new HttpReturnModel { Success = "-1", Message = e.Message });
+ }
+ }
}
}
diff --git a/Wms/Wms/appsettings.json b/Wms/Wms/appsettings.json
index a307195..42bd2db 100644
--- a/Wms/Wms/appsettings.json
+++ b/Wms/Wms/appsettings.json
@@ -24,7 +24,7 @@
},
"ApiUrlConfig": {
"ErpHost": "http://10.110.24.30:8081", //erpIP
- "WcsHost": "http://localhost:57061", //wcsIPhttp://localhost:57061/
+ "WcsHost": "http://10.26.254.34:5005", //wcsIPhttp://localhost:57061/
"BoxHost": "http://10.110.24.30:8081", //boxIP
"IssueComApiUrl": "/api/WCSApi/AddTasks", //涓嬪彂鍛戒护(鍑哄簱銆佺Щ搴�)
--
Gitblit v1.8.0