From 286db121ac6b7e56b1b579ebcdd191526890f4af Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 02 一月 2025 13:22:07 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.Entity/SysEntity/SysToken.cs | 27 +++
Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs | 59 +++++++
Wms/Model/InterFaceModel/SoModel.cs | 4
Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs | 4
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs | 12
Wms/Model/ModelDto/SysDto/MaterialsDto.cs | 5
Wms/Wms/appsettings.json | 10
Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs | 4
Wms/WMS.BLL/SysServer/StorageAreaServer.cs | 6
Wms/Model/InterFaceModel/AsnModels.cs | 6
Wms/WMS.BLL/SysServer/Token.cs | 3
Wms/Wms/Controllers/BasisController.cs | 2
Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs | 1
Wms/Model/ModelDto/BllAsnDto/BoxInfoDto.cs | 5
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs | 50 ++++-
Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs | 3
Wms/WMS.DAL/SysInfrastructure/MaterialsRepository.cs | 2
Wms/Model/ModelVm/SysVm/LocateVm.cs | 7
Wms/WMS.BLL/DataServer/StockServer.cs | 2
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 5
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 32 ++-
Wms/WMS.BLL/SysServer/StorageLocatServer.cs | 2
Wms/WMS.IDAL/ISysInterface/IStorageLocatRepository.cs | 2
Wms/WMS.IBLL/IBllAsnServer/IPalletBindServer.cs | 22 ++
Wms/Model/InterFaceModel/HttpModel.cs | 2
Wms/Wms/Controllers/DownApiController.cs | 77 +++++++++
Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs | 87 ++++++++++
27 files changed, 384 insertions(+), 57 deletions(-)
diff --git a/Wms/Model/InterFaceModel/AsnModels.cs b/Wms/Model/InterFaceModel/AsnModels.cs
index 8d13886..c5a3f3a 100644
--- a/Wms/Model/InterFaceModel/AsnModels.cs
+++ b/Wms/Model/InterFaceModel/AsnModels.cs
@@ -92,4 +92,10 @@
}
+ public class RequesIsBale
+ {
+
+ public string PalletNo { get; set; }
+ }
+
}
diff --git a/Wms/Model/InterFaceModel/HttpModel.cs b/Wms/Model/InterFaceModel/HttpModel.cs
index 8882911..8e220c6 100644
--- a/Wms/Model/InterFaceModel/HttpModel.cs
+++ b/Wms/Model/InterFaceModel/HttpModel.cs
@@ -121,7 +121,7 @@
public string TaskNo { get; set; }
/// <summary>
- /// 浠诲姟绫诲瀷
+ /// 浠诲姟绫诲瀷 0锛氬叆搴擄紝1锛氬嚭搴擄紝2:绉诲簱锛�3锛氬叆搴撹９鍖�
/// </summary>
public string TaskType { get; set; }
diff --git a/Wms/Model/InterFaceModel/SoModel.cs b/Wms/Model/InterFaceModel/SoModel.cs
index 557f11a..15ba286 100644
--- a/Wms/Model/InterFaceModel/SoModel.cs
+++ b/Wms/Model/InterFaceModel/SoModel.cs
@@ -49,11 +49,11 @@
/// <summary>
/// 鐢熶骇鏃ユ湡銆恲yyy-MM-dd
/// </summary>
- public DateTime? producttime { get; set; }
+ public string producttime { get; set; }
/// <summary>
/// 鏈夋晥鏈熻嚦銆恲yyy-MM-dd
/// </summary>
- public DateTime? expiry { get; set; }
+ public string expiry { get; set; }
/// <summary>
/// 澶栫鍚椼�恠tring(100)/闈炵┖銆�
/// </summary>
diff --git a/Wms/Model/ModelDto/BllAsnDto/BoxInfoDto.cs b/Wms/Model/ModelDto/BllAsnDto/BoxInfoDto.cs
index 7aad7f1..82c4f75 100644
--- a/Wms/Model/ModelDto/BllAsnDto/BoxInfoDto.cs
+++ b/Wms/Model/ModelDto/BllAsnDto/BoxInfoDto.cs
@@ -194,5 +194,10 @@
/// 鐢熸垚涓�缁寸爜璺緞
/// </summary>
public string ImgStr { get; set; }
+
+ /// <summary>
+ /// 鏁伴噺鐨勫崟浣�
+ /// </summary>
+ public string unit { get; set; }
}
}
diff --git a/Wms/Model/ModelDto/SysDto/MaterialsDto.cs b/Wms/Model/ModelDto/SysDto/MaterialsDto.cs
index a0a4b8f..f12fc69 100644
--- a/Wms/Model/ModelDto/SysDto/MaterialsDto.cs
+++ b/Wms/Model/ModelDto/SysDto/MaterialsDto.cs
@@ -147,5 +147,10 @@
/// 鏇存柊浜哄悕绉�
/// </summary>
public string UpdateUserName { get; set; }
+
+ /// <summary>
+ /// 鏄惁缂犺啘
+ /// </summary>
+ public string IsWrap { get; set; }
}
}
diff --git a/Wms/Model/ModelVm/SysVm/LocateVm.cs b/Wms/Model/ModelVm/SysVm/LocateVm.cs
index cfd673b..1c805df 100644
--- a/Wms/Model/ModelVm/SysVm/LocateVm.cs
+++ b/Wms/Model/ModelVm/SysVm/LocateVm.cs
@@ -113,7 +113,12 @@
/// </summary>
[MaxLength(3)]
public string Temperature { get; set; }
-
+ /// <summary>
+ /// 鍖哄煙
+ /// </summary>
+ [MaxLength(3)]
+ public string Area { get; set; }
+
}
/// <summary>
/// 鏌ヨ鍌ㄤ綅model
diff --git a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
index dfa78f2..0391053 100644
--- a/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -22,6 +22,7 @@
using System.Security.Policy;
using WMS.Entity.DataEntity;
using WMS.Entity.BllQualityEntity;
+using Microsoft.VisualBasic;
namespace WMS.BLL.BllAsnServer
{
@@ -344,6 +345,16 @@
continue;
}
}
+ if (!string.IsNullOrEmpty(detailModel.IsBale))
+ {
+ detailModel.IsBale = detailModel.IsBale == "鏄�" ? "1" : "0";
+ if (detailModel.IsBale != "1" && detailModel.IsBale != "0")
+ {
+ //鍒ゆ柇鏄惁瑁瑰寘
+ strMessage = "-1:瑁瑰寘瀛楁鍙兘褰曞叆鈥滄槸鈥濇垨鈥滃惁鈥�;";
+ continue;
+ }
+ }
if (model.Type != "7")
{
if (!TypeLot.Contains(model.Type))
@@ -439,7 +450,7 @@
{
var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
//缁橶CS涓嬪彂鍏ュ簱鍗曚俊鎭�
- response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍑哄簱鍛戒护", "WCS");
+ response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橶CS鍏ュ簱鍛戒护", "WCS");
//瑙ｆ瀽杩斿洖鏁版嵁
var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
@@ -498,6 +509,7 @@
return strMessage;
}
+
sqlString += $"select * from BllArrivalNotice where ASNNo = '{model.ASNNo}' and isDel = '0';";
var asnInfo = Db.Ado.SqlQuery<BllArrivalNotice>(sqlString).FirstOrDefault();
if (asnInfo.Status != "0")
@@ -550,6 +562,16 @@
{
strMessage = "-1:鎵规鍙蜂笉鍙负绌�;";
continue;
+ }
+ if (!string.IsNullOrEmpty(detailModel.IsBale))
+ {
+ detailModel.IsBale = detailModel.IsBale == "鏄�" ? "1" : "0";
+ if (detailModel.IsBale != "1" && detailModel.IsBale != "0")
+ {
+ //鍒ゆ柇鏄惁瑁瑰寘
+ strMessage = "-1:瑁瑰寘瀛楁鍙兘褰曞叆鈥滄槸鈥濇垨鈥滃惁鈥�;";
+ continue;
+ }
}
if (model.Type == "2") // 2锛氫腑闂村搧鍏ュ簱
@@ -997,11 +1019,11 @@
resultModel.Message = "鍗曟嵁绫诲瀷涓嶅彲涓虹┖!";
return resultModel;
}
- if (string.IsNullOrEmpty(model.Customer))
- {
- resultModel.Message = "瀹㈡埛涓嶅彲涓虹┖!";
- return resultModel;
- }
+ //if (string.IsNullOrEmpty(model.Customer))
+ //{
+ // resultModel.Message = "瀹㈡埛涓嶅彲涓虹┖!";
+ // return resultModel;
+ //}
if (string.IsNullOrEmpty(model.OrderCode))
{
resultModel.Message = "涓婃父绯荤粺鍗曞彿涓嶅彲涓虹┖!";
@@ -1014,11 +1036,14 @@
}
// 鏍规嵁瀹㈡埛缂栧彿鑾峰彇瀹㈡埛鍚嶇О
+ var custname = "";
var CustomerModel = Db.Queryable<SysCustomer>().First(it => it.CustomerNo == model.Customer && it.IsDel == "0");
- if (CustomerModel == null)
+ if (CustomerModel != null)
{
- resultModel.Message = "瀹㈡埛缂栧彿涓嶅瓨鍦�!";
- return resultModel;
+ custname = CustomerModel.CustomerName;
+ //CustomerModel.CustomerName = "";
+ //resultModel.Message = "瀹㈡埛缂栧彿涓嶅瓨鍦�!";
+ //return resultModel;
}
// 鍏ュ簱鎬昏〃淇℃伅
@@ -1029,7 +1054,7 @@
Type = model.AsnType,
Origin = string.IsNullOrEmpty(model.Origin) ? "ERP" : model.Origin,
CustomerNo = model.Customer,
- CustomerName = CustomerModel.CustomerName,
+ CustomerName = custname,
OrderCode = model.OrderCode,
};
@@ -1177,7 +1202,8 @@
if (mesList.Contains(notice.Type)) // mes
{
//鑾峰彇浠ょ墝
- var token = new Token().GetMesToken(mesTokenUrl);
+ //var token = new Token().GetMesToken(mesTokenUrl); //娴嬭瘯涓嶄娇鐢═OKEN锛屾寮忚繍琛屾椂鏀惧紑
+ var token = "";
Dictionary<string, string> mesDic = new Dictionary<string, string>()
{
{"Authorization",token }
@@ -1192,7 +1218,7 @@
var response = HttpHelper.DoPost(mesUrl, jsonData, "鍏ュ簱鍗曞畬鎴愪笂浼�", "MES", mesDic);
var obj = JsonConvert.DeserializeObject<MesModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
- if (obj.status != "0")
+ if (obj.status != "success")
{
throw new Exception("涓婁紶澶辫触" + obj.message);
}
diff --git a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
index 4736f19..f9f6655 100644
--- a/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/BllBoxInfoServer.cs
@@ -16,6 +16,9 @@
using WMS.Entity.SysEntity;
using WMS.IBLL.IBllAsnServer;
using ZXing;
+using Model.ModelDto.BllCheckDto;
+using WMS.Entity.BllCheckEntity;
+using System.Data.SqlTypes;
namespace WMS.BLL.BllAsnServer
{
@@ -424,7 +427,9 @@
var data = GetAllWhereAsync(item)
.LeftJoin<SysUserInfor>((a, b) => a.CreateUser == b.Id)
.LeftJoin<SysUserInfor>((a, b, c) => a.UpdateUser == c.Id)
- .Select((a, b, c) => new BoxInfoDto()
+ .LeftJoin<SysMaterials>((a, b, c,d) => a.SkuNo == d.SkuNo)
+ .LeftJoin<SysUnit>((a, b, c, d,e) => d.UnitNo == e.UnitNo)
+ .Select((a, b, c,d,e) => new BoxInfoDto()
{
Id = a.Id,
ASNNo = a.ASNNo,
@@ -442,6 +447,8 @@
LotNo = a.LotNo,
LotText = a.LotText,
+
+ unit = e.UnitName,
Status = a.Status,
SupplierLot = a.SupplierLot,
@@ -1087,6 +1094,8 @@
//List<WmsLabelPrintLog> printlog = new List<WmsLabelPrintLog>();
//鏍囩琛ㄦ暟鎹俊鎭�
var list = Db.Queryable<BllBoxInfo>().Where(m => m.IsDel == "0" && m.Origin == "WMS鐢熸垚").ToList();
+
+
#region MyRegion
@@ -1107,6 +1116,9 @@
{
throw new Exception($"鏈煡璇㈠埌{boxNo}淇℃伅");
}
+ //鍗曚綅
+ var sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + data.SkuNo + "'";
+ var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault() ;
// 鐗╂枡鏉＄爜淇℃伅璧嬪��
BoxInfoDto model = new BoxInfoDto();
model.SkuNo = data.SkuNo;
@@ -1120,6 +1132,7 @@
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model.Qty = dataList.Sum(m=>m.Qty);// 鏁伴噺
+ model.unit = unitname.unit;
model.BoxNo = data.BoxNo; // 绠卞彿
@@ -1162,6 +1175,9 @@
{
throw new Exception($"鏈煡璇㈠埌{item}淇℃伅");
}
+ //鍗曚綅
+ var sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + data.SkuNo + "'";
+ var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
// 鐗╂枡鏉＄爜淇℃伅璧嬪��
BoxInfoDto model = new BoxInfoDto();
model.SkuNo = data.SkuNo;
@@ -1175,6 +1191,7 @@
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model.Qty = data1.Sum(m => m.Qty);// 鏁伴噺
+ model.unit = unitname.unit;
model.BoxNo = data.BoxNo; // 绠卞彿
@@ -1214,6 +1231,9 @@
{
throw new Exception($"鏈煡璇㈠埌{boxNo2}淇℃伅");
}
+ //鍗曚綅
+ var sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + data.SkuNo + "'";
+ var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
// 鐗╂枡鏉＄爜淇℃伅璧嬪��
BoxInfoDto model = new BoxInfoDto();
model.SkuNo = data.SkuNo;
@@ -1227,6 +1247,7 @@
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model.Qty = data.Qty;// 鏁伴噺
+ model.unit = unitname.unit;
model.BoxNo = data.BoxNo3; // 鏀彿
@@ -1266,6 +1287,9 @@
var i = 0;
foreach (var data in data2)
{
+ //鍗曚綅
+ var sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + data.SkuNo + "'";
+ var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
// 鐗╂枡鏉＄爜淇℃伅璧嬪��
BoxInfoDto model = new BoxInfoDto();
model.SkuNo = data.SkuNo;
@@ -1279,6 +1303,7 @@
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model.Qty = data.Qty;// 鏁伴噺
+ model.unit = unitname.unit;
model.BoxNo = data.BoxNo3; // 绠卞彿
@@ -1330,8 +1355,10 @@
{
throw new Exception($"褰撳墠鏀爜涓嶆槸绠辩爜鍐�");
}
-
+ //鍗曚綅
+ var sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + data.SkuNo + "'";
+ var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
// 鐗╂枡鏉＄爜淇℃伅璧嬪�� 绠辩爜
BoxInfoDto model1 = new BoxInfoDto();
model1.SkuNo = data.SkuNo;
@@ -1344,6 +1371,7 @@
model1.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model1.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model1.Qty = dataList.Sum(m=>m.Qty);// 鏁伴噺
+ model1.unit = unitname.unit;
model1.BoxNo = data.BoxNo; // 绠卞彿
model1.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 40, false);
@@ -1363,6 +1391,7 @@
model.ExpirationTime = data.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = data.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model.Qty = data.Qty;// 鏁伴噺
+ model.unit = unitname.unit;
model.BoxNo = data.BoxNo3; // 鏀彿
model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 40, false);
@@ -1398,6 +1427,9 @@
var data = list.Where(m => m.BoxNo == boxNo);
var boxData = data2.FirstOrDefault();
+ //鍗曚綅
+ var sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + boxData.SkuNo + "'";
+ var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
// 鐗╂枡鏉＄爜淇℃伅璧嬪��
BoxInfoDto model = new BoxInfoDto();
model.SkuNo = boxData.SkuNo;
@@ -1410,6 +1442,7 @@
model.ExpirationTime = boxData.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = boxData.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
+ model.unit = unitname.unit;
model.BoxNo = boxData.BoxNo; // 鏀彿
model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 40, false);
@@ -1420,6 +1453,9 @@
var i = 0;
foreach (var item in data2)
{
+ //鍗曚綅
+ sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + item.SkuNo + "'";
+ unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
// 鐗╂枡鏉＄爜淇℃伅璧嬪��
BoxInfoDto model1 = new BoxInfoDto();
model1.SkuNo = item.SkuNo;
@@ -1432,6 +1468,7 @@
model1.ExpirationTime = item.ExpirationTime; // 鏈夋晥鏈熻嚦
model1.StoreTime = item.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model1.Qty = item.Qty;// 鏁伴噺
+ model1.unit = unitname.unit;
model1.BoxNo = item.BoxNo3; // 鏀彿
model.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 40, false);
@@ -1466,6 +1503,9 @@
{
throw new Exception($"鏈煡璇㈠埌{boxNo}绠辩爜淇℃伅");
}
+ //鍗曚綅
+ var sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + boxData.SkuNo + "'";
+ var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
// 鐗╂枡鏉＄爜淇℃伅璧嬪��
BoxInfoDto model = new BoxInfoDto();
model.SkuNo = boxData.SkuNo;
@@ -1478,6 +1518,7 @@
model.ExpirationTime = boxData.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = boxData.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
+ model.unit = unitname.unit;
model.BoxNo = boxData.BoxNo; // 鏀彿
model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 40, false);
@@ -1490,6 +1531,9 @@
var i = 0;
foreach (var item in data)
{
+ //鍗曚綅
+ sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + item.SkuNo + "'";
+ unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
// 鐗╂枡鏉＄爜淇℃伅璧嬪��
BoxInfoDto model1 = new BoxInfoDto();
model1.SkuNo = item.SkuNo;
@@ -1502,6 +1546,7 @@
model1.ExpirationTime = item.ExpirationTime; // 鏈夋晥鏈熻嚦
model1.StoreTime = item.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model1.Qty = item.Qty; // 鏁伴噺
+ model1.unit = unitname.unit;
model1.BoxNo = item.BoxNo3; // 鏀彿
model1.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 40, false);
@@ -1558,6 +1603,9 @@
{
throw new Exception($"鏈煡璇㈠埌{demo}绠辩爜淇℃伅");
}
+ //鍗曚綅
+ var sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + boxData.SkuNo + "'";
+ var unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
// 鐗╂枡鏉＄爜淇℃伅璧嬪��
BoxInfoDto model = new BoxInfoDto();
model.SkuNo = boxData.SkuNo;
@@ -1570,6 +1618,7 @@
model.ExpirationTime = boxData.ExpirationTime; // 鏈夋晥鏈熻嚦
model.StoreTime = boxData.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model.Qty = data.Sum(m => m.Qty); // 鏁伴噺
+ model.unit = unitname.unit;
model.BoxNo = boxData.BoxNo; // 鏀彿
model.ImgStr = BarcodeHelper.GetCodeBarBase64(model.BoxNo, 160, 40, false);
@@ -1586,6 +1635,9 @@
{
foreach (var item in data.OrderBy(m => m.BoxNo3).ToList())
{
+ //鍗曚綅
+ sqlString = "select a.UnitName as unit from SysUnit a left join SysMaterials b on a.UnitNo = b.UnitNo where b.SkuNo = '" + item.SkuNo + "'";
+ unitname = Db.Ado.SqlQuery<BoxInfoDto>(sqlString).FirstOrDefault();
// 鐗╂枡鏉＄爜淇℃伅璧嬪��
BoxInfoDto model1 = new BoxInfoDto();
model1.SkuNo = item.SkuNo;
@@ -1598,6 +1650,7 @@
model1.ExpirationTime = item.ExpirationTime; // 鏈夋晥鏈熻嚦
model1.StoreTime = item.StoreTime; // 鍌ㄥ瓨鏈熻嚦
model1.Qty = item.Qty;// 鏁伴噺
+ model1.unit = unitname.unit;
model1.BoxNo = item.BoxNo3; // 鏀彿
model1.ImgStr = BarcodeHelper.GetCodeBarBase64(model1.BoxNo, 160, 40, false);
@@ -1630,6 +1683,8 @@
}
#endregion
+
+
return printModelList;
}
diff --git a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
index 9888083..f1f7215 100644
--- a/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
+++ b/Wms/WMS.BLL/BllAsnServer/PalletBindServer.cs
@@ -21,6 +21,7 @@
using WMS.Entity.SysEntity;
using WMS.IBLL.IBllAsnServer;
using WMS.Entity.BllQualityEntity;
+using WMS.Entity.BllCheckEntity;
namespace WMS.BLL.BllAsnServer
{
@@ -1186,7 +1187,7 @@
EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
- TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
+ TaskType = "0",// 浠诲姟绫诲瀷 (鍏ュ簱)
OutMode = "", //鐩爣鍦板潃
Order = 1
};
@@ -1908,9 +1909,9 @@
EndLocate = beingTask.EndLocat, // 鐩爣浣嶇疆
EndRoadway = beingTask.EndRoadway, // 鐩爣宸烽亾
TaskNo = beingTask.TaskNo, // 浠诲姟鍙�
- TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
+ TaskType = "0",// 浠诲姟绫诲瀷 (鍑哄簱)
OutMode = "", //鐩爣鍦板潃
- Order = 1
+ Order = 1
};
if (beingTask.IsSuccess == 0)
{
@@ -3187,6 +3188,86 @@
}
+ //鐢宠缂犺啘鍏ュ簱
+ public int RequestPackWcs(string palletNo)
+ {
+ try
+ {
+ int t = -1;
+ //楠岃瘉鎵樼洏鏉＄爜鏄惁涓虹┖
+ if (string.IsNullOrEmpty(palletNo))
+ {
+ throw new Exception("鏈壘鍒拌鎵樼洏鏉＄爜锛�"+ palletNo);
+ }
+ var palletBindList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && m.Status == "1").OrderByDescending(m=>m.CreateTime).First();
+ if (palletBindList.IsBale == "1")
+ {
+ t = 1;
+ }
+ return t;
+
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+
+ }
+ }
+
+ //鐢宠鎷嗚啘鍑哄簱
+ public int RequestUnPackWcs(string palletNo)
+ {
+ try
+ {
+ int t = -1;
+ //楠岃瘉鎵樼洏鏉＄爜鏄惁涓虹┖
+ if (string.IsNullOrEmpty(palletNo))
+ {
+ throw new Exception("鏈壘鍒拌鎵樼洏鏉＄爜锛�" + palletNo);
+ }
+ var palletBindList = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && m.LocatNo.Substring(0,1) != "B").First();
+ if (palletBindList.IsBelt == "1")
+ {
+ palletBindList.IsBelt = "0";
+ Db.Updateable(palletBindList).ExecuteCommand();
+ t = 1;
+ }
+
+ return t;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+
+ }
+ }
+
+ //缂犺啘瀹屾垚
+ public int RequestPackedWcs(string palletNo)
+ {
+ try
+ {
+ int t = -1;
+ //楠岃瘉鎵樼洏鏉＄爜鏄惁涓虹┖
+ if (string.IsNullOrEmpty(palletNo))
+ {
+ throw new Exception("鏈壘鍒拌鎵樼洏鏉＄爜锛�" + palletNo);
+ }
+ var palletBindList = Db.Queryable<BllPalletBind>().Where(m => m.IsDel == "0" && m.PalletNo == palletNo && m.Status == "1").OrderByDescending(m => m.CreateTime).First();
+ if (palletBindList.IsBale == "1")
+ {
+ palletBindList.IsBelt = "1";
+ Db.Updateable(palletBindList).ExecuteCommand();
+ }
+
+ return t;
+ }
+ catch (Exception e)
+ {
+ throw new Exception(e.Message);
+
+ }
+ }
////閲嶆柊涓嬪彂鍏ュ簱浠诲姟
//public OutCommandDto AgainSendAsnTask(string taskNo, int userId, string url)
diff --git a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
index 1a504ba..acf4038 100644
--- a/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
+++ b/Wms/WMS.BLL/BllCheckServer/StockCheckServer.cs
@@ -1397,8 +1397,8 @@
materiel_name = item.SkuName,
qty = item.Qty,
batch = item.LotNo,
- producttime = item.ProductionTime,
- expiry = item.ExpirationTime
+ producttime = item.ProductionTime.ToString().Substring(1, 8),
+ expiry = item.ExpirationTime.ToString().Substring(1, 8)
});
}
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
index 716f754..b38fcf2 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -1762,8 +1762,8 @@
SupplierLot = "",
InspectMark = "0",
BitPalletMark = "1",
- IsBale = "0",
- IsBelt = "0",
+ IsBale = arrivalnotice.IsBale,
+ IsBelt = arrivalnotice.IsBelt,
CreateUser = userId
};
// 鎻掑叆鎵樼洏缁戝畾琛�
@@ -1836,8 +1836,8 @@
BitPalletMark = "1",
InspectStatus = sku.IsInspect,// 缁勭洏鐨勬椂鍊欏氨瑕侀粯璁よ瀹氬ソ鏄惁鍚堟牸
PackagNo = sku.PackagNo,
- IsBale = null,
- IsBelt = null,
+ IsBale = arrivalnotice.IsBale,
+ IsBelt = arrivalnotice.IsBelt,
CreateUser = userId,
CreateTime = serverTime
};
@@ -2574,8 +2574,8 @@
SupplierLot = detail.SupplierLot,
InspectMark = "0",
BitPalletMark = "1",
- IsBale = "0",
- IsBelt = "0",
+ IsBale = detail.IsBale,
+ IsBelt = detail.IsBelt,
CreateUser = userId,
Demo = model.Demo,
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 62822c6..b4bb031 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -1358,6 +1358,8 @@
try
{
#region 鍒ゆ柇淇℃伅
+ //寮�鍚簨鍔�
+ Db.BeginTran();
var stockDetail = Db.Queryable<DataStockDetail>().Where(w => w.IsDel == "0" && w.PalletNo == palletNo).ToList();
if (stockDetail.Count == 0)
@@ -1374,6 +1376,8 @@
throw new Exception("璇ユ墭鐩樻湭鍦ㄥ钩搴撳唴,璇锋鏌�!");
}
+
+
//璧峰鍌ㄤ綅淇℃伅
var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == locatNo);
if (storageLocat == null)
@@ -1389,8 +1393,7 @@
#endregion
- //寮�鍚簨鍔�
- Db.BeginTran();
+
//闇�鍏堝垽鏂洰鏍囧湴鍧�鍓嶆柟鏄惁鏈夌┖鍌ㄤ綅
@@ -1422,8 +1425,18 @@
{
throw new Exception("鎵樼洏涓婄墿鏂欑鐮佷俊鎭笉瀛樺湪,璇锋鏌�!");
}
+ //var boxno = boxInfo.GroupBy(w => w.BoxNo).ToList();
+ var boxno = Db.Queryable<DataBoxInfo>().Where(m => m.IsDel == "0" && m.StockDetailId == item.Id).GroupBy(m => new
+ {
+ m.BoxNo
+ }).Select(it => new DataBoxInfo()
+ {
+ BoxNo = it.BoxNo
+ }).ToList();
+
//璁板綍鎵樼洏涓婁俊鎭粰MES
- foreach (var item2 in boxInfo) {
+ foreach (var item2 in boxno) {
+ var a = item.ProductionTime.ToString();
data.Add(new RequertBeiliaoInfoModel()
{
no = item2.BoxNo,
@@ -1431,8 +1444,8 @@
materiel_name = item.SkuName,
qty = item.Qty,
batch = item.LotNo,
- producttime = item.ProductionTime,
- expiry = item.ExpirationTime
+ producttime = item.ProductionTime.ToString().Substring(0,10),
+ expiry = item.ExpirationTime.ToString().Substring(0, 10)
});
}
@@ -1459,14 +1472,16 @@
if (EndLocat != null && EndLocat.AreaNo == "B12")
{
//鑾峰彇浠ょ墝
- var token = new Token().GetMesToken(mesTokenUrl);
+ //var token = new Token().GetMesToken(mesTokenUrl);
+ var token = "";
Dictionary<string, string> mesDic = new Dictionary<string, string>()
{
{"Authorization",token }
};
+ var mescode = Db.Queryable<BllExportNotice>().Where(w => w.SONo == stockDetail.First().SONo).First();
var mesData = new RequertBeiliaoModel()
{
- morder_no = stockDetail.First().SONo,
+ morder_no = mescode.OrderCode,
pallet = stockDetail.First().PalletNo,
layer_no = EndLocat.LocatNo,
items = data
@@ -1476,7 +1491,7 @@
var response = HttpHelper.DoPost(mesUrl, jsonData, "澶囨枡瀹屾垚杩愯嚦缂撳瓨鍖哄弽棣堣嚦MES", "MES", mesDic);
var obj = JsonConvert.DeserializeObject<MesModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
- if (obj.status != "0")
+ if (obj.status != "success")
{
throw new Exception("澶囨枡鍚屾MES澶辫触锛�" + obj.message);
}
@@ -1501,7 +1516,6 @@
}
-
#endregion
#region 绠辩爜鏌ヨ
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
index 5d6d22b..517de10 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaSoServer.cs
@@ -4177,11 +4177,11 @@
throw new Exception("璇ョ鐮佸唴瀛樺湪鏀爜涓嶈兘杩涜鏁伴噺鎷ｈ揣");
}
decimal boxQty = boxInfo.First().Qty;
- if (Convert.ToInt32(pickQty1) > boxQty)
+ if (decimal.Parse(pickQty1) > boxQty)
{
throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬绠卞唴鏁伴噺");
}
- if (Convert.ToInt32(pickQty1) > needQty)
+ if (decimal.Parse(pickQty1) > needQty)
{
throw new Exception("鎷ｈ揣鏁伴噺涓嶈兘澶т簬鍓╀綑寰呮嫞鏁伴噺");
}
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 1ffa2f4..c732892 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -230,6 +230,7 @@
Type = model.SoType,
Status = "0",
Origin = model.Origin,
+ OrderCode = model.OrderNo,
//CustomerNo = model.Customer,
//CustomerName = customer.CustomerName,
LogisticsId = logisticsId,
@@ -594,7 +595,7 @@
//娣诲姞鍑哄簱鍗�
foreach (var d in model.Detail)
{
- if (d.Qty < 1)
+ if (d.Qty <=0)
{
throw new Exception("鍑哄簱鏁伴噺蹇呴』澶т簬0");
}
@@ -1760,7 +1761,7 @@
if (unstackingMode2 == "0")//鏈哄櫒浜烘媶鍨�
{
- toLocation = loadingAddre;//瑁呰溅鍙�
+ toLocation = "009";//鏈哄櫒浜烘媶鍨涚粺涓�鍙戦�佸埌009宸ヤ綅锛岀敱PLC鑷姩鍒嗛厤鎷嗗灈浣�
}
else //PDA鎷嗗灈
{
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index 2f70ce4..265e972 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -203,7 +203,7 @@
}
if (!string.IsNullOrEmpty(categoryNo))
{
- str += " and area.CategoryNo = @categoryNo";
+ str += " and cat.CategoryNo = @categoryNo";
}
if (!string.IsNullOrEmpty(type))
{
diff --git a/Wms/WMS.BLL/SysServer/StorageAreaServer.cs b/Wms/WMS.BLL/SysServer/StorageAreaServer.cs
index 1dc557a..352a027 100644
--- a/Wms/WMS.BLL/SysServer/StorageAreaServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageAreaServer.cs
@@ -326,6 +326,12 @@
case "4":
str = "绌烘墭鍖�";
break;
+ case "5":
+ str = "鑰楁潗鍖�";
+ break;
+ case "6":
+ str = "涓棿鍝佸尯";
+ break;
default:
str = "";
break;
diff --git a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
index 318052b..83c4ef3 100644
--- a/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
+++ b/Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -145,7 +145,7 @@
{
try
{
- var bl = LocatRst.EditStorageLocat(model.Id, model.Status, model.Flag, model.Temperature, userId);
+ var bl = LocatRst.EditStorageLocat(model.Id, model.Status, model.Flag, model.Temperature,model.Area, userId);
return bl;
}
diff --git a/Wms/WMS.BLL/SysServer/Token.cs b/Wms/WMS.BLL/SysServer/Token.cs
index 6f21cf1..ec45099 100644
--- a/Wms/WMS.BLL/SysServer/Token.cs
+++ b/Wms/WMS.BLL/SysServer/Token.cs
@@ -67,6 +67,7 @@
var obj = JsonConvert.DeserializeObject<MesTokenModel>(response);//瑙ｆ瀽杩斿洖鏁版嵁
+
if (obj.status != "success")
{
throw new Exception("涓婁紶澶辫触" + obj.message);
@@ -97,7 +98,7 @@
return token;
}
}
-
+
#endregion
}
catch (Exception)
diff --git a/Wms/WMS.DAL/SysInfrastructure/MaterialsRepository.cs b/Wms/WMS.DAL/SysInfrastructure/MaterialsRepository.cs
index 73e37c6..a70e21d 100644
--- a/Wms/WMS.DAL/SysInfrastructure/MaterialsRepository.cs
+++ b/Wms/WMS.DAL/SysInfrastructure/MaterialsRepository.cs
@@ -114,7 +114,7 @@
/// <returns></returns>
public List<SysMaterials> GetMateByNo(string SkuNo)
{
- string str = "select * from SysMaterials where SkuNo = @skuno";
+ string str = "select * from SysMaterials where SkuNo = @skuno and isdel = '0'";
List<SysMaterials> mate = Db.Ado.SqlQuery<SysMaterials>(str, new
{
skuno = SkuNo //鐗╂枡缂栧彿
diff --git a/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs b/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs
index 5bcced6..6356608 100644
--- a/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs
+++ b/Wms/WMS.DAL/SysInfrastructure/StorageLocatRepository.cs
@@ -29,7 +29,7 @@
/// <param name="temperature">瀛樺偍鐜</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- public bool EditStorageLocat(int id, string status, string flag, string temperature, int userId)
+ public bool EditStorageLocat(int id, string status, string flag, string temperature,string area, int userId)
{
try
{
@@ -69,6 +69,7 @@
locate.Temperature = temperature;
locate.UpdateUser = userId;
locate.UpdateTime = DateTime.Now;
+ locate.AreaNo = area;
var i = Edit(locate);
Db.CommitTran();
return i > 0;
diff --git a/Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs b/Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs
index b0d76e1..edd84a0 100644
--- a/Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs
+++ b/Wms/WMS.Entity/BllAsnEntity/BllBoxInfo.cs
@@ -221,6 +221,5 @@
/// Nullable:True
/// </summary>
public int QtyOrd { get; set; }
-
}
}
diff --git a/Wms/WMS.Entity/SysEntity/SysToken.cs b/Wms/WMS.Entity/SysEntity/SysToken.cs
index f0525d7..8485d2d 100644
--- a/Wms/WMS.Entity/SysEntity/SysToken.cs
+++ b/Wms/WMS.Entity/SysEntity/SysToken.cs
@@ -30,5 +30,32 @@
/// </summary>
public DateTime? ExpireTime { get; set; }
+ /// <summary>
+ /// 鍒犻櫎鏍囪
+ /// Nullable:true
+ /// </summary>
+ public string IsDel { get; set; }
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// Nullable:true
+ /// </summary>
+ public int? CreateUser { get; set; }
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// Nullable:true
+ /// </summary>
+ public DateTime? CreateTime { get; set; }
+ /// <summary>
+ /// 淇敼浜�
+ /// Nullable:true
+ /// </summary>
+
+ public int? UpdateUser { get; set; }
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// Nullable:true
+ /// </summary>
+ public DateTime? UpdateTime { get; set; }
+
}
}
diff --git a/Wms/WMS.IBLL/IBllAsnServer/IPalletBindServer.cs b/Wms/WMS.IBLL/IBllAsnServer/IPalletBindServer.cs
index 721b8e6..6a8fa4f 100644
--- a/Wms/WMS.IBLL/IBllAsnServer/IPalletBindServer.cs
+++ b/Wms/WMS.IBLL/IBllAsnServer/IPalletBindServer.cs
@@ -136,6 +136,28 @@
/// <returns></returns>
OutCommandDto FullException(ReceiveWcsSignal model);
+ /// <summary>
+ /// WCS鐢宠缂犺啘鍏ュ簱
+ /// </summary>
+ /// <param name="palletNo">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ int RequestPackWcs(string palletNo);
+
+ /// <summary>
+ /// WCS鐢宠鎷嗚啘鍑哄簱
+ /// </summary>
+ /// <param name="palletNo">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ int RequestUnPackWcs(string palletNo);
+
+ /// <summary>
+ /// WCS鐢宠缂犺啘瀹屾垚
+ /// </summary>
+ /// <param name="palletNo">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ int RequestPackedWcs(string palletNo);
+
+
///// <summary>
///// 閲嶆柊涓嬪彂鍏ュ簱浠诲姟
diff --git a/Wms/WMS.IDAL/ISysInterface/IStorageLocatRepository.cs b/Wms/WMS.IDAL/ISysInterface/IStorageLocatRepository.cs
index 41cac9d..3c463ca 100644
--- a/Wms/WMS.IDAL/ISysInterface/IStorageLocatRepository.cs
+++ b/Wms/WMS.IDAL/ISysInterface/IStorageLocatRepository.cs
@@ -19,7 +19,7 @@
/// <param name="temperature">瀛樺偍鐜</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- bool EditStorageLocat(int id, string status, string flag, string temperature, int userId);
+ bool EditStorageLocat(int id, string status, string flag, string temperature,string area, int userId);
/// <summary>
/// 缂栬緫鍌ㄤ綅淇℃伅闆嗗悎
/// </summary>
diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index 1d03f17..310dcf3 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -1285,7 +1285,7 @@
int i = await _mate.AddMate(matedto);
await _operation.InsertOperation("鍩虹淇℃伅", "鐗╂枡绠＄悊", matedto.SkuNo, "娣诲姞", "娣诲姞鐗╂枡淇℃伅 鐗╂枡鍙凤細" + matedto.SkuNo, uid);
- return Ok(new { data = i, code = 0, msg = "鎴愬姛" });
+ return Ok(new { data = i, code = i, msg = "鎴愬姛" });
}
catch (Exception ex)
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index 8729e68..09af858 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -429,7 +429,7 @@
var bl = _exNoticeSvc.EmptyException(model);
LogFile.SaveLogToFile($"绌哄彇寮傚父锛�(鎵ц缁撴灉鎴愬姛),", logStr);
- return Ok(new { Success = 0, Message = "" });
+ return Ok(new { Success = 0,StatusCode = 0, Message = "" });
}
catch (Exception e)
{
@@ -454,7 +454,7 @@
var list = _asnPalletBindSvc.FullException(model);
LogFile.SaveLogToFile($"婊″叆寮傚父锛�( {JsonConvert.SerializeObject(list)} ),", logStr);
- return Ok(new { Success = 0, Message = "", TaskList = list });
+ return Ok(new { Success = 0, StatusCode = 0, Message = "", TaskList = list });
}
catch (Exception e)
{
@@ -588,6 +588,78 @@
}
}
+ /// <summary>
+ /// WCS鐢宠鏄惁缂犺啘
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [AllowAnonymous]
+ [HttpPost]
+ public IActionResult RequestPackWcs(RequesIsBale model)
+ {
+ var logStr = $@".\log\WCS\WCS鐢宠缂犺啘鎷嗚啘" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ try
+ {
+ int t = _asnPalletBindSvc.RequestPackWcs(model.PalletNo);
+ LogFile.SaveLogToFile($"WCS鐢宠缂犺啘鍏ュ簱璇锋眰锛岃姹傛墭鐩樺憟锛�( {model.PalletNo} ),", logStr);
+
+ return Ok(new { Success = t, Message = "缂犺啘鎸囦护鍙戦�佹垚鍔�" });
+ }
+ catch (Exception e)
+ {
+ LogFile.SaveLogToFile($"WCS鐢宠缂犺啘鍏ュ簱寮傚父杩斿洖锛�( {e.Message} ),", logStr);
+
+ return Ok(new ErpModel { Success = -1, Message = e.Message });
+ }
+ }
+
+ /// <summary>
+ /// WCS鐢宠鏄惁鎷嗚啘
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [AllowAnonymous]
+ [HttpPost]
+ public IActionResult RequestUnPackWcs(RequesIsBale model)
+ {
+ var logStr = $@".\log\WCS\WCS鐢宠缂犺啘鎷嗚啘" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ try
+ {
+ int t = _asnPalletBindSvc.RequestUnPackWcs(model.PalletNo);
+
+ return Ok(new { Success = t, Message = "鎷嗚啘鎸囦护鍙戦�佹垚鍔�" });
+ }
+ catch (Exception e)
+ {
+ LogFile.SaveLogToFile($"WCS鐢宠鎷嗚啘鍑哄簱寮傚父杩斿洖锛�( {e.Message} ),", logStr);
+
+ return Ok(new ErpModel { Success = -1, Message = e.Message });
+ }
+ }
+
+ /// <summary>
+ /// WCS鍙嶉缂犺啘瀹屾垚
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ [AllowAnonymous]
+ [HttpPost]
+ public IActionResult RequestPackedWcs(RequesIsBale model)
+ {
+ var logStr = $@".\log\WCS\WCS鐢宠缂犺啘鎷嗚啘" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
+ try
+ {
+ int t = _asnPalletBindSvc.RequestPackedWcs(model.PalletNo);
+
+ return Ok(new { Success = t, Message = "缂犺啘瀹屾垚鎸囦护鍙戦�佹垚鍔�" });
+ }
+ catch (Exception e)
+ {
+ LogFile.SaveLogToFile($"WCS鐢宠缂犺啘瀹屾垚寮傚父杩斿洖锛�( {e.Message} ),", logStr);
+
+ return Ok(new ErpModel { Success = -1, Message = e.Message });
+ }
+ }
///// <summary>
///// 鎴愬搧绠辩爜鎷嗗灈鎷ｈ揣
@@ -652,6 +724,7 @@
switch (orderType)
{
case "0"://鍏ュ簱浠诲姟鎵ц
+
case "1"://鍑哄簱浠诲姟鎵ц
case "2"://鐩樺簱浠诲姟鎵ц
case "3"://绉诲簱浠诲姟鎵ц
diff --git a/Wms/Wms/appsettings.json b/Wms/Wms/appsettings.json
index 097a659..5c09e14 100644
--- a/Wms/Wms/appsettings.json
+++ b/Wms/Wms/appsettings.json
@@ -24,8 +24,8 @@
},
"ApiUrlConfig": {
"ErpHost": "http://10.110.24.30:8081", //erpIP
- "MesHost": "http://10.110.24.30:8081", //mesIP
- "WcsHost": "http://10.18.52.10:5005", // "http://localhost:57061", //wcsIPhttp://localhost:57061/
+ "MesHost": "http://10.18.99.67:3000", //mesIP
+ "WcsHost": "http://10.60.16.10:5005", // "http://localhost:57061", //wcsIPhttp://localhost:57061/
"BoxHost": "http://10.110.24.30:8081", //boxIP
"AgvHost": "http://10.110.24.30:8081", //agvIP
@@ -41,9 +41,9 @@
"GetBoxUrl": "/api/wmsInterface/OutStockTask", //鑾峰彇绠辩爜淇℃伅
//MES
- "MesAsnFinishUrl": "/port/mes/service/mes/save_worder_feedback", //鍏ュ簱鍗曞叧鍗曞弽棣�
- "MesBeiLiaoUrl": "/port/mes/service/mes/save_morder_feedback", //澶囨枡鍙嶉(鍘熸枡澶囨枡鍒扮敓浜ц溅闂寸紦瀛樺尯)
- "MesGetTokenUrl": "/port/mes/service/system/sign_login", //鑾峰彇浠ょ墝
+ "MesAsnFinishUrl": "/mes/service/mes/save_worder_feedback", //鍏ュ簱鍗曞叧鍗曞弽棣�
+ "MesBeiLiaoUrl": "/mes/service/mes/save_morder_feedback", //澶囨枡鍙嶉(鍘熸枡澶囨枡鍒扮敓浜ц溅闂寸紦瀛樺尯)
+ "MesGetTokenUrl": "/mes/service/system/sign_login", //鑾峰彇浠ょ墝
// 璧嬬爜
"FuMaGetBoxUrl": "/port/mes/service/system/sign_login", //鑾峰彇璧嬬爜绠辩爜淇℃伅
"FuMaGetTokenUrl": "/port/mes/service/system/sign_login", //鑾峰彇浠ょ墝
--
Gitblit v1.8.0