From d48e486d63ae2a0fc454c27c79b8f12115e4bcbe Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 18 十月 2025 16:20:45 +0800
Subject: [PATCH] 修改
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 666 ++++++++++++++++---------------------------------------
1 files changed, 198 insertions(+), 468 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
index 9b662bd..8a41ce8 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
@@ -1,10 +1,12 @@
锘縰sing HslCommunication;
+using MailKit.Search;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.OrderEnum;
using WIDESEA_Common.TaskEnum;
@@ -174,7 +176,10 @@
//}
-
+ /// <summary>
+ /// 杩囨护娌℃湁瀵瑰晢鍝佽繘琛岀淮鎶ょ殑鍑哄簱鍗曡繘琛岃繃婊�
+ /// </summary>
+ /// <returns></returns>
public WebResponseContent GetUpstreamOutOrder()
{
var responseContent = new WebResponseContent();
@@ -220,9 +225,12 @@
try
{
List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
+ List<string> orderNos = new();
foreach (var outorder in newOutOrders)
{
+
+ bool skipOrder = false; // 鏍囪鏄惁璺宠繃璇ュ叆搴撳崟
var entityOrder = new Dt_DeliveryOrder
{
Out_no = outorder.order_no,
@@ -240,19 +248,40 @@
{
// 1锔忊儯 杞负姝ｆ暟锛堜笂娓稿彲鑳戒紶璐熸暟锛�
item.order_qty = Math.Abs(item.order_qty);
+
+ //鍑哄簱鏁伴噺
decimal orderQty = (decimal)item.order_qty;
// 2锔忊儯 鏌ョ墿鏂欏熀纭�淇℃伅锛堣幏鍙栫瑙勶級
- var medication = BaseDal.Db.Queryable<Dt_MedicineGoods>()
- .Where(m => m.Goods_no == item.goods_no)
+ var medication = BaseDal.Db.Queryable<Dt_MaterielInfo>()
+ .Where(m => m.MaterielCode == item.goods_no)
.First();
+ #region 妫�鏌ヨ繖涓嚭搴撳崟涓殑鐗╂枡淇℃伅鏄惁瀛樺湪
+ //濡傛灉鐗╂枡淇℃伅涓嶅瓨鍦紝璺宠繃鏁翠釜鍏ュ簱鍗�
+ if (medication == null)
+ {
+ skipOrder = true;
+ Console.WriteLine($"璺宠繃鍏ュ簱鍗� {outorder.order_no}锛屽師鍥狅細鏈壘鍒板晢鍝� [{item.goods_no}] 鐨勭墿鏂欎俊鎭��");
+ break;
+ }
+
+ // 鑻ョ墿鏂欎笉瀛樺湪鎴� MaterielSourceType 涓虹┖锛屽垯璺宠繃鏁翠釜鍑哄簱鍗�
+ if (medication == null || !Enum.IsDefined(typeof(MaterielSourceTypeEnum), medication.MaterielSourceType))
+ {
+ skipOrder = true;
+ break;
+ }
+
+
if (medication == null)
{
SendErrorToUpstream(3, "", $"鎵句笉鍒扮墿鏂欎俊鎭細{item.goods_no}", "");
continue;
}
+ #endregion
+ // 濡傛灉绠辫灏忎簬绛変簬0锛屼娇鐢ㄩ粯璁ゅ��1,鍚﹀垯灏辩敤瀹為檯鏁伴噺
decimal boxQty = medication.BoxQty <= 0 ? 1 : medication.BoxQty;
// 3锔忊儯 璁＄畻鏁翠欢涓庢暎浠舵暟閲�
@@ -263,31 +292,61 @@
string requestedBatch = string.IsNullOrEmpty(item.batch_num) ? null : item.batch_num;
// helper: 鏌ヨ搴撳瓨鍑芥暟锛堟寜鍏ュ簱鏃堕棿鍗囧簭锛�
- Func<int, List<Dt_InventoryInfo>> queryInventoryByStockStatus = (stockStatus) =>
+ #region 浣跨敤搴撳瓨淇℃伅涓殑stockStatus鏉ュ尯鍒嗗钩搴撳拰绔嬪簱
+ // 瀹氫箟涓�涓鎵樺彉閲忥細杈撳叆int鍙傛暟锛岃繑鍥濴ist<Dt_InventoryInfo>
+ //Func<int, List<Dt_InventoryInfo>> queryInventoryByStockStatus = (stockStatus) =>
+ //{
+ // // 1. 鍒涘缓鍩虹鏌ヨ
+ // var q = BaseDal.Db.Queryable<Dt_InventoryInfo>()
+ // .Where(i => i.MaterielCode == item.goods_no && // 鐗╂枡缂栧彿鍖归厤
+ // (i.StockQuantity - i.OutboundQuantity) > 0 && // 鍙敤搴撳瓨>0
+ // i.StockStatus == stockStatus); // 搴撳瓨鐘舵�佸尮閰�
+
+ // // 2. 鏉′欢绛涢�夛紙濡傛灉鏈夋壒娆″彿瑕佹眰锛�
+ // if (!string.IsNullOrEmpty(requestedBatch))
+ // q = q.Where(i => i.BatchNo == requestedBatch);
+
+ // // 3. 鎵ц鏌ヨ骞惰繑鍥炵粨鏋�
+ // return q.OrderBy(i => i.InDate).ToList(); // 鎸夊叆搴撴椂闂存帓搴�
+ //};
+ #endregion
+
+ #region 浣跨敤搴撴埧缂栧彿鏉ュ尯鍒嗘槸骞冲簱鍜岀珛搴�
+ // helper: 鏌ヨ搴撳瓨鍑芥暟锛堟寜鍏ュ簱鏃堕棿鍗囧簭锛�
+ // 鐢ㄥ簱鎴跨紪鍙峰尯鍒嗙珛搴撳拰骞冲簱锛氱珛搴� WarehouseCode == "001" 杈撳叆true灏辨槸绔嬪簱鍚﹀垯灏辨槸骞冲簱
+ Func<bool, List<Dt_InventoryInfo>> queryInventoryByWarehouseType = (isLiku) =>
{
var q = BaseDal.Db.Queryable<Dt_InventoryInfo>()
.Where(i => i.MaterielCode == item.goods_no &&
- (i.StockQuantity - i.OutboundQuantity) > 0 &&
- i.StockStatus == stockStatus);
+ (i.StockQuantity - i.OutboundQuantity) > 0);
+
+ if (isLiku)
+ q = q.Where(i => i.WarehouseCode == "001"); // 绔嬪簱
+ else
+ q = q.Where(i => i.WarehouseCode != "001"); // 骞冲簱
if (!string.IsNullOrEmpty(requestedBatch))
q = q.Where(i => i.BatchNo == requestedBatch);
return q.OrderBy(i => i.InDate).ToList();
};
-
- // 4锔忊儯鍒嗛厤鏁ｄ欢锛堜紭鍏堢珛搴� Status=1锛�
- decimal remainingPartial = partialQty;
+ #endregion
+ // 4锔忊儯鍒嗛厤鏁ｄ欢锛堜紭鍏堢珛搴� WarehouseCode == "001锛�
+ decimal remainingPartial = partialQty; //鏁ｄ欢
if (remainingPartial > 0)
{
- var invList_ly = queryInventoryByStockStatus(1);
+ //杩斿洖涓�涓狶ist<Dt_InventoryInfo>stockStatus==0鐨勫簱瀛樺垪琛�
+ var invList_ly = queryInventoryByWarehouseType(true); //绔嬪簱 WarehouseCode == "001"
foreach (var inv in invList_ly)
{
if (remainingPartial <= 0) break;
+ //鍙敤搴撳瓨鏁伴噺
decimal available = (decimal)(inv.StockQuantity - inv.OutboundQuantity);
+
if (available <= 0) continue;
+ //琛ㄧず銆屽綋鍓嶈繕闇�瑕佸嚭搴撶殑鏁伴噺銆嶆垨銆屽緟鍒嗛厤鏁伴噺銆嶃��
decimal use = Math.Min(available, remainingPartial);
var detail = new Dt_DeliveryOrderDetail
@@ -298,7 +357,7 @@
Exp_date = inv.ValidityPeriod,
OotDetailStatus = "鏂板缓",
Status = 0, //绔嬪簱
- Reservoirarea = inv.LocationCode
+ Reservoirarea = inv.WarehouseCode
};
entityOrder.Details.Add(detail);
@@ -311,7 +370,7 @@
// 绔嬪簱涓嶅 鈫� 骞冲簱琛� (Status=2)
if (remainingPartial > 0)
{
- var invList_pk = queryInventoryByStockStatus(2);
+ var invList_pk = queryInventoryByWarehouseType(false); //骞冲簱
foreach (var inv in invList_pk)
{
if (remainingPartial <= 0) break;
@@ -329,7 +388,7 @@
Exp_date = inv.ValidityPeriod,
OotDetailStatus = "鏂板缓",
Status = 2, //骞冲簱
- Reservoirarea = inv.LocationCode
+ Reservoirarea = inv.WarehouseCode
};
entityOrder.Details.Add(detail);
@@ -347,10 +406,10 @@
}
//鍒嗛厤鏁翠欢锛堜紭鍏堝钩搴� Status=2锛�
- int remainingFullBoxes = fullBoxes;
+ int remainingFullBoxes = fullBoxes;//鏁翠欢绠辨暟
if (remainingFullBoxes > 0)
{
- var invList_pk = queryInventoryByStockStatus(2);
+ var invList_pk = queryInventoryByWarehouseType(true);
foreach (var inv in invList_pk)
{
if (remainingFullBoxes <= 0) break;
@@ -372,7 +431,7 @@
Exp_date = inv.ValidityPeriod,
OotDetailStatus = "鏂板缓",
Status = 2, //骞冲簱
- Reservoirarea = inv.LocationCode
+ Reservoirarea = inv.WarehouseCode
};
entityOrder.Details.Add(detail);
@@ -382,10 +441,10 @@
remainingFullBoxes -= useBoxes;
}
- // 骞冲簱涓嶅 鈫� 绔嬪簱琛� (Status=1)
+ // 骞冲簱涓嶅 鈫� 绔嬪簱琛� (Status=0)
if (remainingFullBoxes > 0)
{
- var invList_ly = queryInventoryByStockStatus(1);
+ var invList_ly = queryInventoryByWarehouseType(true); //绔嬪簱
foreach (var inv in invList_ly)
{
if (remainingFullBoxes <= 0) break;
@@ -417,12 +476,19 @@
remainingFullBoxes -= useBoxes;
}
}
+ // 鉂楀鏋滆烦杩囪鍗曪紝鍒欑洿鎺ontinue锛屼笉淇濆瓨
+ if (skipOrder)
+ {
+ Console.WriteLine($"璺宠繃鍏ュ簱鍗� {outorder.order_no}锛屽洜涓哄瓨鍦ㄦ湭瀹氫箟鐗╂枡灞炴�х殑鍟嗗搧銆�");
+ continue;
+ }
if (remainingFullBoxes > 0)
{
decimal unfilledQty = remainingFullBoxes * boxQty;
SendErrorToUpstream(3, "", $"鍑哄簱鍗昜{outorder.order_no}]鐗╂枡[{item.goods_no}]鏁寸搴撳瓨涓嶈冻锛屾湭鍒嗛厤鏁伴噺锛歿unfilledQty}", "");
}
+
}
}
@@ -450,7 +516,6 @@
return responseContent.Error("鍚屾澶辫触: " + ex.Message);
}
}
-
/// <summary>
/// 鍑哄簱鍗曟帹閫佺粰 WCS
@@ -486,10 +551,10 @@
string materialCode = "YY";//榛樿鍊�
//鑾峰彇褰撳墠璁㈠崟鐨勭涓�涓槑缁嗛」
var firstDetail = order.Details.FirstOrDefault();
- if (firstDetail?.MedicineGoods != null && !string.IsNullOrEmpty(firstDetail.MedicineGoods.MaterialCode))
+ if (firstDetail?.MedicineGoods != null && !string.IsNullOrEmpty(firstDetail.MedicineGoods.MaterielErpType))
{
//濡傛灉鏉′欢婊¤冻锛屽皢鐗╂枡浠ｇ爜璁剧疆涓虹涓�涓槑缁嗛」瀵瑰簲鐨勮嵂鍝佺墿鏂欎唬鐮�
- materialCode = firstDetail.MedicineGoods.MaterialCode;
+ materialCode = firstDetail.MedicineGoods.MaterielErpType;
}
// 3. 缁勮 DTO
var ediDto = new TowcsDto.ToediOutInfo
@@ -504,8 +569,8 @@
{
batchNo = d.Batch_num,
productCode = d.Goods_no,
- productName = d.MedicineGoods?.Goods_spm,
- productSpecifications = d.MedicineGoods?.Model,
+ productName = d.MedicineGoods?.MaterielName,
+ productSpecifications = d.MedicineGoods?.MaterielModel,
quantity = (int)d.Order_qty,
//stocktakingDetails = order.Out_type == "3"
// ? new List<ToOutediInStock>
@@ -534,7 +599,6 @@
.SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1, OotDetailStatus = "宸插畬鎴�" })
.Where(d => d.DeliveryOrderId == order.Id && d.Status == 0)
.ExecuteCommand();
-
Console.WriteLine($"璁㈠崟 {order.Out_no} 鎺ㄩ�佹垚鍔�");
}
else
@@ -561,221 +625,67 @@
}
- /// <summary>
- /// 鍑哄簱鎶ュ畬鎴愭帴鍙�
- /// </summary>
- /// <param name="out_no">鍑哄簱鍗曞彿</param>
- /// <returns></returns>
- //public WebResponseContent CompleteOutOrder(string out_no)
- //{
- // var responseContent = new WebResponseContent();
- // try
- // {
- // if (string.IsNullOrWhiteSpace(out_no))
- // {
- // return responseContent.Error("鍏ュ簱鍗曞彿涓嶅彲浠ヤ负绌�");
- // }
-
- // Db.Ado.BeginTran();
- // //鍏堟煡澶磋〃
- // var outOerd= BaseDal.Db.Queryable<Dt_DeliveryOrder>()
- // .Where(o => o.Out_no == out_no)
- // .First();
- // if (outOerd == null)
- // {
- // return responseContent.Error($"娌℃湁鎵惧埌璇ュ嚭搴撳崟鍙穥out_no}");
- // }
- // //鏌ユ壘鎵�鏈夋槑缁嗚〃鏄惁閮藉凡瀹屾垚
- // var incompleteDetails = BaseDal.Db.Queryable<Dt_DeliveryOrderDetail>()
- // .Where(d => d.DeliveryOrderId == outOerd.Id && d.OotDetailStatus == "宸插畬鎴�")
- // .Count();
- // if (incompleteDetails>0)
- // {
- // // 鏇存柊鍑哄簱鍗曠姸鎬�
- // BaseDal.Db.Updateable<Dt_DeliveryOrder>()
- // .SetColumns(o => new Dt_DeliveryOrder { OutStatus = "寮�濮�" })
- // .Where(o => o.Out_no == out_no)
- // .ExecuteCommand();
- // var url = " http://127.0.0.1:9090/GYZ2/95fck/outOrderOk";
- // var reslut = HttpHelper.Post(url, new { out_no }.ToJsonString());
- // var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(reslut);
- // if (response.resultCode != "0")
- // {
- // SendErrorToUpstream(4, "", "涓婃父鎺ュ彛杩斿洖澶辫触", "");
- // return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
- // }
- // Db.Ado.CommitTran();
- // return responseContent.OK("鎿嶄綔鎴愬姛,鍑哄簱鍗曚互鍙婃槑缁嗗叏閮ㄥ畬鎴�");
- // }
- // else
- // {
- // return responseContent.OK("鎿嶄綔鎴愬姛锛屼絾浠绘湁涓哄畬鎴愮殑鏄庣粏");
- // }
- // }
- // catch (Exception ex)
- // {
- // Db.Ado.RollbackTran();
- // SendErrorToUpstream(1, "", ex.Message, "");
- // return responseContent.Error("鍚屾澶辫触: " + ex.Message);
- // }
- //}
-
-
- /// <summary>
- ///鐩樼偣鍑哄簱鍗曟帹閫佺粰 WCS
- /// </summary>
- /// <param name="externalOrderNo">鍑哄簱鍗曞彿</param>
- /// <returns></returns>
- //public WebResponseContent InventoryGood(string externalOrderNo)
- //{
- // try
- // {
- // // 鏌ヨ鍑哄簱鍗曞強鏄庣粏
- // var orders = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>()
- // .Where(x => x.Out_no == externalOrderNo)
- // .Includes(o => o.Details, d => d.MedicineGoods)
- // .ToList();
-
-
- // if (orders == null || orders.Count == 0)
- // {
- // return new WebResponseContent().Error("娌℃湁鎵惧埌璇ュ嚭搴撳崟");
- // }
-
- // var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
- // bool allSuccess = true;
-
- // foreach (var order in orders)
- // {
- // //鏌ユ壘缁欏晢鍝佺殑搴撳瓨
- // var Invert = BaseDal.Db.Queryable<Dt_Inventory>()
- // .Where(i => i.Goods_no == order.Out_no).First();
- // var ediDto = new TowcsDto.ToediOutInfo
- // {
- // customerCode = "905",
- // materialCode = "YY",
- // externalOrderNo = order.Out_no,
- // outOrderType = "20", // 鐩樼偣鍑哄簱鍗�
- // priority = 1,
- // Is_cancel = 0,
- // details = order.Details.Select(d => new TowcsDto.ToeOutdiInDetail
- // {
- // batchNo = d.Batch_num,
- // productCode = d.Goods_no,
- // productName = d.MedicineGoods?.Goods_spm,
- // productSpecifications = d.MedicineGoods?.Model,
- // quantity = (int)d.Order_qty,
- // stocktakingDetails = new List<TowcsDto.ToOutediInStock>
- // {
- // new TowcsDto.ToOutediInStock
- // {
- // palletCode = Invert.PalletCode, // 瀹為檯浠庣郴缁熷彇
- // quantity = d.Order_qty.ToString()
- // }
- // }
- // }).ToList()
- // };
-
- // var result = HttpHelper.Post(url, ediDto.ToJsonString());
- // var resp = JsonConvert.DeserializeObject<TowcsDto.TowcsResponse<object>>(result);
-
- // if (resp == null || resp.code != "0")
- // {
- // allSuccess = false;
- // break;
- // }
- // }
-
- // return allSuccess
- // ? new WebResponseContent { Status = true, Message = "鐩樼偣鎴愬姛" }
- // : new WebResponseContent { Status = false, Message = "鐩樼偣澶辫触" };
- // }
- // catch (Exception ex)
- // {
- // return new WebResponseContent { Status = false, Message = ex.Message };
- // }
- //}
-
-
- public WebResponseContent InventoryGood(string externalOrderNo)
+ //鐩樼偣 鎷挎暣涓壒娆′俊鎭〃鐨勫晢鍝佹壒鍙峰拰鍟嗗搧缂栧彿鏉ヨ繘琛岀洏鐐�
+ public WebResponseContent InventoryGood(string batchNo, string goodsNo)
{
+ var response = new WebResponseContent();
try
{
- // 1. 鏌ュ嚭鍑哄簱鍗曞強鏄庣粏
- var orders = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>()
- .Where(x => x.Out_no == externalOrderNo)
- .Includes(o => o.Details, d => d.MedicineGoods)
- .ToList();
+ // 1锔忊儯 鏌ユ壘鎸囧畾鎵规涓庣墿鏂欑殑搴撳瓨淇℃伅
+ var batchInfo = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
+ .Where(x => x.BatchNo == batchNo && x.MaterielCode == goodsNo)
+ .First();
- if (orders == null || orders.Count == 0)
- return new WebResponseContent().Error("娌℃湁鎵惧埌璇ュ嚭搴撳崟");
+ if (batchInfo == null)
+ return response.Error($"鏈壘鍒拌鐗╂枡 [{goodsNo}] 鎵规 [{batchNo}] 鐨勫簱瀛樹俊鎭�");
- // 2. 鑾峰彇鎵�鏈夊晢鍝佺紪鍙�
- var allGoodsNos = orders
- .SelectMany(o => o.Details.Select(d => d.Goods_no))
- .Distinct()
- .ToList();
-
- // 3. 涓�娆℃�ф煡璇㈠簱瀛樹俊鎭�
- var inventoryList = BaseDal.Db.Queryable<Dt_Inventory>()
- .Where(i => allGoodsNos.Contains(i.Goods_no))
- .ToList();
-
- var inventoryDict = inventoryList.ToDictionary(i => i.Goods_no, i => i);
- string url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
- bool allSuccess = true;
-
- // 4. 鏋勯�犵洏鐐瑰嚭搴撹姹�
- foreach (var order in orders)
+ // 2锔忊儯 缁勮璇锋眰 DTO锛堝畬鍏ㄧ鍚堟帴鍙ｆ枃妗ｇ粨鏋勶級
+ var ediDto = new TowcsDto.ToediOutInfo
{
- var ediDto = new TowcsDto.ToediOutInfo
- {
- customerCode = "905",
- materialCode = "YY",
- externalOrderNo = order.Out_no,
- outOrderType = "20", // 鐩樼偣鍑哄簱鍗�
- priority = 1,
- Is_cancel = 0,
- details = order.Details.Select(d =>
- {
- inventoryDict.TryGetValue(d.Goods_no, out var invert);
-
- return new TowcsDto.ToeOutdiInDetail
- {
- batchNo = d.Batch_num,
- productCode = d.Goods_no,
- productName = d.MedicineGoods?.Goods_spm,
- productSpecifications = d.MedicineGoods?.Model,
- quantity = (int)d.Order_qty,
- stocktakingDetails = new List<TowcsDto.ToOutediInStock>
- {
- new TowcsDto.ToOutediInStock
- {
- palletCode = invert?.PalletCode ?? string.Empty,
- quantity = d.Order_qty.ToString()
- }
- }
- };
- }).ToList()
- };
-
- var result = HttpHelper.Post(url, ediDto.ToJsonString());
- var resp = JsonConvert.DeserializeObject<TowcsDto.TowcsResponse<object>>(result);
-
- if (resp == null || resp.code != "0")
- {
- allSuccess = false;
- break;
- }
+ customerCode = "905",
+ materialCode = "YY", // 鐗╂枡绫诲瀷CODE
+ externalOrderNo = $"PDCK-{batchInfo.Id}", // 澶栭儴鍑哄簱鍗曞彿
+ outOrderType = "20", // 鐩樼偣鍑哄簱鍗�
+ priority = 1,
+ Is_cancel = 0,
+ details = new List<TowcsDto.ToeOutdiInDetail>
+ {
+ new TowcsDto.ToeOutdiInDetail
+ {
+ batchNo = batchInfo.BatchNo,
+ productCode = batchInfo.MaterielCode,
+ productName = batchInfo.MaterielName,
+ productSpecifications = batchInfo.MaterielSpec,
+ quantity = (int)batchInfo.SupplyQuantity,
+ //stocktakingDetails = new List<TowcsDto.ToOutediInStock>
+ //{
+ // // 鐩樼偣鏄庣粏鍙牴鎹疄闄呮墭鐩樻媶鍒嗭紱姝ゅ绀轰緥浠�1鏉�
+ // new TowcsDto.ToOutediInStock
+ // {
+ // palletCode = "FC00001",
+ // quantity = batchInfo.SupplyQuantity.ToString()
+ // }
+ //}
}
+ }
+ };
- return allSuccess
- ? new WebResponseContent { Status = true, Message = "鐩樼偣鎴愬姛" }
- : new WebResponseContent { Status = false, Message = "鐩樼偣澶辫触" };
+ // 3锔忊儯 璋冪敤鎺ュ彛
+ string url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
+ var result = HttpHelper.Post(url, ediDto.ToJsonString());
+ var resp = JsonConvert.DeserializeObject<TowcsDto.TowcsResponse<object>>(result);
+
+ // 4锔忊儯 鍝嶅簲澶勭悊
+ if (resp == null)
+ return response.Error("WCS 鏃犲搷搴�");
+ if (resp.code != "0")
+ return response.Error($"WCS杩斿洖澶辫触: {resp.msg}");
+
+ return response.OK("鐩樼偣鍑哄簱涓嬪彂鎴愬姛");
}
catch (Exception ex)
{
- return new WebResponseContent { Status = false, Message = ex.Message };
+ return response.Error("鐩樼偣澶辫触锛�" + ex.Message);
}
}
@@ -920,175 +830,7 @@
}
- //public WebResponseContent CompleteAllOutOrders()
- //{
- // var responseContent = new WebResponseContent();
- // try
- // {
- // var orders = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
- // .Where(o => o.OutStatus == "寮�濮�")
- // .ToList();
- // if (orders == null || !orders.Any())
- // {
- // return responseContent.OK("鏆傛棤闇�瑕佸鐞嗙殑鍑哄簱鍗�");
- // }
-
- // int successCount = 0;
- // int failCount = 0;
- // int serverErrorCount = 0;
-
- // foreach (var order in orders)
- // {
- // try
- // {
- // Db.Ado.BeginTran();
-
- // var details = BaseDal.Db.Queryable<Dt_DeliveryOrderDetail>()
- // .Where(d => d.DeliveryOrderId == order.Id)
- // .ToList();
-
- // var completedCount = details.Count(d => d.OotDetailStatus == "宸插畬鎴�");
- // var totalCount = details.Count;
-
- // if (totalCount > 0 && completedCount == totalCount)
- // {
- // // 鏇存柊鐘舵�佷负宸插畬鎴�
- // BaseDal.Db.Updateable<Dt_DeliveryOrder>()
- // .SetColumns(o => o.OutStatus == "宸插畬鎴�")
- // .Where(o => o.Id == order.Id)
- // .ExecuteCommand();
-
- // // 璋冪敤涓婃父鎺ュ彛
- // var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
- // var requestDate = new
- // {
- // order_no = order.Out_no
- // };
-
- // string result;
- // try
- // {
- // result = HttpHelper.Post(url, requestDate.ToJsonString());
- // }
- // catch (Exception httpEx)
- // {
- // // HTTP璇锋眰寮傚父锛堢綉缁滈棶棰樼瓑锛�
- // Db.Ado.RollbackTran();
- // failCount++;
- // SendErrorToUpstream(3, "", $"缃戠粶璇锋眰澶辫触: {httpEx.Message}", order.Out_no);
- // continue;
- // }
-
- // // 鉁� 妫�鏌ユ槸鍚︽槸500閿欒椤甸潰
- // if (!string.IsNullOrEmpty(result) && result.Contains("500閿欒椤甸潰"))
- // {
- // Db.Ado.RollbackTran();
- // serverErrorCount++;
- // SendErrorToUpstream(5, "", "涓婃父鎺ュ彛鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�(500)锛岃鑱旂郴涓婃父绯荤粺绠＄悊鍛�", order.Out_no);
- // continue;
- // }
-
- // // 鉁� 妫�鏌ユ槸鍚︽槸HTML鍝嶅簲
- // if (!string.IsNullOrEmpty(result) && result.Trim().StartsWith("<"))
- // {
- // Db.Ado.RollbackTran();
- // failCount++;
- // SendErrorToUpstream(4, "", "涓婃父鎺ュ彛杩斿洖闈濲SON鏍煎紡鍝嶅簲", order.Out_no);
- // continue;
- // }
-
- // // 鉁� 瀹夊叏瑙ｆ瀽JSON
- // UpstreamOrderResponse response;
- // try
- // {
- // response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
- // }
- // catch (JsonReaderException jsonEx)
- // {
- // Db.Ado.RollbackTran();
- // failCount++;
- // SendErrorToUpstream(4, "", $"涓婃父鎺ュ彛杩斿洖鏁版嵁鏍煎紡閿欒: {jsonEx.Message}", order.Out_no);
- // continue;
- // }
-
- // if (response.resultCode == "0")
- // {
- // // 鎴愬姛澶勭悊閫昏緫...
- // var orderHistory = new Dt_DeliveryOrder_Hty
- // {
- // Id = order.Id,
- // Out_no = order.Out_no,
- // Out_type = order.Out_type,
- // Client_no = order.Client_no,
- // Client_name = order.Client_name,
- // Account_time = order.Account_time,
- // Warehouse_no = order.Warehouse_no,
- // OutStatus = "宸插畬鎴�",
- // Details = details.Select(d => new Dt_DeliveryOrderDetail
- // {
- // Id = d.Id,
- // DeliveryOrderId = d.DeliveryOrderId,
- // Reservoirarea = d.Reservoirarea,
- // Goods_no = d.Goods_no,
- // Order_qty = d.Order_qty,
- // Batch_num = d.Batch_num,
- // Exp_date = d.Exp_date,
- // OotDetailStatus = d.OotDetailStatus,
- // Status = d.Status
- // }).ToList()
- // };
-
- // var historyId = BaseDal.Db.Insertable(orderHistory).ExecuteReturnIdentity();
-
- // var detailHistories = details.Select(d => new Dt_DeliveryOrderDetail_Hty
- // {
- // Id = d.Id,
- // DeliveryOrderId = order.Id,
- // Reservoirarea = d.Reservoirarea,
- // Goods_no = d.Goods_no,
- // Order_qty = d.Order_qty,
- // Batch_num = d.Batch_num,
- // Exp_date = d.Exp_date,
- // OotDetailStatus = d.OotDetailStatus,
- // Status = d.Status
- // }).ToList();
-
- // BaseDal.Db.Insertable(detailHistories).ExecuteCommand();
-
- // BaseDal.Db.Deleteable<Dt_DeliveryOrderDetail>().Where(d => d.DeliveryOrderId == order.Id).ExecuteCommand();
- // BaseDal.Db.Deleteable<Dt_DeliveryOrder>().Where(o => o.Id == order.Id).ExecuteCommand();
-
- // Db.Ado.CommitTran();
- // successCount++;
- // }
- // else
- // {
- // Db.Ado.RollbackTran();
- // failCount++;
- // SendErrorToUpstream(4, "", $"涓婃父鎺ュ彛杩斿洖澶辫触: {response.resultMsg}", order.Out_no);
- // }
- // }
- // else
- // {
- // Db.Ado.RollbackTran();
- // }
- // }
- // catch (Exception ex)
- // {
- // Db.Ado.RollbackTran();
- // failCount++;
- // SendErrorToUpstream(1, "", ex.Message, order.Out_no);
- // }
- // }
-
- // return responseContent.OK($"鎵归噺澶勭悊瀹屾垚锛氭垚鍔� {successCount} 鍗曪紝澶辫触 {failCount} 鍗曪紝鏈嶅姟鍣ㄩ敊璇� {serverErrorCount} 鍗曘��");
- // }
- // catch (Exception ex)
- // {
- // return responseContent.Error("鎵归噺澶勭悊澶辫触锛�" + ex.Message);
- // }
- //}
/// <summary>
/// 鎺ㄩ�佸紓甯镐俊鎭粰涓婃父绯荤粺 1.鍏ュ簱鍗曟帴鍙ｏ紱2.鍏ュ簱鍗曟姤瀹屾垚鎺ュ彛锛�3.鍑哄簱鍗曟帴鍙ｏ紱4.鍑哄簱鎶ュ畬鎴愭帴鍙ｏ紱5.鑽搧鍩虹淇℃伅鍚屾鎺ュ彛锛�6.渚涘簲鍟嗕俊鎭帴鍙ｏ紱7.瀹㈡埛淇℃伅鎺ュ彛锛�8.搴撳瓨鏌ヨ鎺ュ彛
@@ -1117,33 +859,6 @@
}
}
- public WebResponseContent GetPdDeliveryOrders(SaveModel saveModel)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- int pageNo = saveModel.MainData["pageNo"].ObjToInt();
- string warehouseCode = saveModel.MainData["warehouseId"].ToString();
- string orderNo = saveModel.MainData["orderNo"].ToString();
- List<Dt_DeliveryOrder> dt_ReceiveOrders = new List<Dt_DeliveryOrder>();
- if (string.IsNullOrEmpty(orderNo))
- {
- dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.OutStatus == "鏂板缓" || x.OutStatus == "寮�濮�") && x.Warehouse_no == warehouseCode && x.Out_type == "3").Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
- }
- else
- {
- dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.Out_no.Contains(orderNo) || x.Client_no.Contains(orderNo)) && (x.OutStatus == "鏂板缓" || x.OutStatus == "寮�濮�" && x.Out_type == "3") && x.Warehouse_no == warehouseCode).OrderByDescending(x => x.CreateDate).Includes(x => x.Details).ToPageList(pageNo, 5);
- }
-
- content.OK(data: dt_ReceiveOrders);
- }
- catch (Exception)
- {
-
- throw;
- }
- return content;
- }
public WebResponseContent GetDeliveryOrders(SaveModel saveModel)
{
@@ -1160,7 +875,7 @@
}
else
{
- dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.Out_no.Contains(orderNo) || x.Client_no.Contains(orderNo)) && (x.OutStatus == "鏂板缓" || x.OutStatus == "寮�濮�" && x.Out_type != "3") && x.Warehouse_no == warehouseCode).OrderByDescending(x => x.CreateDate).Includes(x => x.Details).ToPageList(pageNo, 5);
+ dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.Out_no.Contains(orderNo) || x.Client_no.Contains(orderNo)) && (x.OutStatus == "鏂板缓" || x.OutStatus == "寮�濮�") && x.Out_type != "3" && x.Warehouse_no == warehouseCode).OrderByDescending(x => x.CreateDate).Includes(x => x.Details).ToPageList(pageNo, 5);
}
content.OK(data: dt_ReceiveOrders);
@@ -1173,6 +888,13 @@
return content;
}
+ /// <summary>
+ /// 鏌ヨ鍑哄簱/鐩樼偣鍗曡鎯� 鐪嬪嚭搴撳崟鏄庣粏銆�
+ /// </summary>
+ /// <param name="pageNo"></param>
+ /// <param name="orderNo"></param>
+ /// <param name="isPick"></param>
+ /// <returns></returns>
public WebResponseContent GetDeliveryOrderDetail(int pageNo, string orderNo, bool isPick)
{
WebResponseContent content = new WebResponseContent();
@@ -1181,29 +903,34 @@
cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Includes(x => x.Details).First(x => x.Out_no == orderNo && x.Out_type == "3");
else
cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Includes(x => x.Details).First(x => x.Out_no == orderNo && x.Out_type != "3");
- List<Dt_DeliveryOrderDetail>? cabinOrderDetails = cabinOrder.Details?.Where(x => x.Reservoirarea == pageNo.ToString()).ToList();
- content.OK(data: cabinOrderDetails);
+ List<Dt_DeliveryOrderDetail>? cabinOrderDetails = cabinOrder.Details?.Where(x => x.Reservoirarea == pageNo.ToString()).ToList();
+ content.OK(data: cabinOrderDetails);
return content;
}
- public WebResponseContent MatPicking(SaveModel saveModel)
+
+ public WebResponseContent OutFinish(SaveModel saveModel)
{
WebResponseContent content = new WebResponseContent();
try
{
- var LocationCode = saveModel.MainData["LocationCode"].ToString();
- var orderNo = saveModel.MainData["orderNo"].ToString();
- var batchNo = saveModel.MainData["batchNo"].ToString();
- var Inqty = saveModel.MainData["Inqty"].ObjToInt();
- var warehouseCode = saveModel.MainData["warehouseCode"].ToString();
- Dt_DeliveryOrder cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == orderNo && x.Warehouse_no == warehouseCode && x.Out_type == "3").Includes(x => x.Details).First();
- if (cabinOrder == null) return WebResponseContent.Instance.Error($"鐩樼偣鍗曞凡瀹屾垚");
- Dt_DeliveryOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == batchNo && x.Reservoirarea == warehouseCode).First();
- if (cabinOrderDetail == null) return WebResponseContent.Instance.Error($"鐩樼偣鍗曟槑缁嗗凡瀹屾垚");
+ var LocationCode = saveModel.MainData["locationCode"].ToString();
+ var TaskId = saveModel.MainData["taskId"].ObjToInt();
+ Dt_SupplyTask supplyTask = _supplyTaskService.Repository.QueryFirst(x => x.TaskId == TaskId && x.TaskStatus == SupplyStatusEnum.NewOut.ObjToInt());
+ if (supplyTask == null) throw new Exception("褰撳墠鍑哄簱浠诲姟宸插畬鎴�");
+ if (supplyTask.LocationCode != LocationCode) throw new Exception($"褰撳墠鍑哄簱璐т綅銆恵LocationCode}銆戜笌浠诲姟鍒嗛厤璐т綅涓嶅尮閰�");
+ supplyTask.TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt();
+
+ Dt_DeliveryOrder cabinOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode).Includes(x => x.Details).First();
+ if (cabinOrder == null) return WebResponseContent.Instance.Error($"鍑哄簱鍗曞凡瀹屾垚");
+
+ Dt_DeliveryOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == supplyTask.BatchNo && x.Reservoirarea == supplyTask.WarehouseCode && x.Goods_no == supplyTask.MaterielCode).First();
+ if (cabinOrderDetail == null) return WebResponseContent.Instance.Error($"鍑哄簱鍗曟槑缁嗗凡瀹屾垚");
Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);
if (materielInfo == null) return WebResponseContent.Instance.Error($"璇风淮鎶ょ墿鏂欑紪鍙枫�恵cabinOrderDetail.Goods_no}銆戠殑鐗╂枡淇℃伅");
- cabinOrderDetail.Order_Outqty += Inqty;
+ cabinOrderDetail.Order_Outqty += supplyTask.StockQuantity;
if (cabinOrderDetail.Order_Outqty > cabinOrderDetail.Order_qty)
- return WebResponseContent.Instance.Error($"瀹炵洏鏁伴噺涓嶅彲瓒呭嚭璐﹂潰鏁伴噺");
+ return WebResponseContent.Instance.Error($"鍑哄簱鏁伴噺涓嶅彲瓒呭嚭鍗曟嵁鏁伴噺");
+
#region 澶勭悊鍑哄簱鍗曪紝璐т綅锛屽簱瀛橈紝搴撳瓨鎵规淇℃伅
_unitOfWorkManage.BeginTran();
@@ -1220,55 +947,51 @@
{
_deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
}
- var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Out_type == "3").Includes(x => x.Details).First();
+ var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Out_type != "3").Includes(x => x.Details).First();
if (cabinOrder1.Details == null || cabinOrder1.Details.Count < 1) cabinOrder.OutStatus = "宸插畬鎴�";
- if (cabinOrder.OutStatus == "宸插畬鎴�")
- Repository.DeleteAndMoveIntoHty(cabinOrder, OperateTypeEnum.鑷姩瀹屾垚);
- else
- Repository.UpdateData(cabinOrder);
+ Repository.UpdateData(cabinOrder);
#endregion
#region 搴撳瓨
Dt_InventoryInfo inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.LocationCode == LocationCode);
if (inventoryInfo == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌揣浣嶃�恵LocationCode}銆戠殑搴撳瓨淇℃伅");
- inventoryInfo.SupplyQuantity += Inqty;
- _inventoryInfoService.UpdateData(inventoryInfo);
+ inventoryInfo.StockQuantity -= supplyTask.StockQuantity;
+ if (inventoryInfo.StockQuantity <= 0)
+ _inventoryInfoService.DeleteData(inventoryInfo);
+ else
+ _inventoryInfoService.UpdateData(inventoryInfo);
#endregion
- #region 浠诲姟璁板綍
- Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ #region 璐т綅
+ var location = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
+ if (location == null) return WebResponseContent.Instance.Error($"璇风淮鎶よ揣浣嶇紪鍙枫�恵LocationCode}銆戠殑璐т綅淇℃伅");
+ if (location.EnableStatus == EnableStatusEnum.Disable.ObjToInt())
+ return WebResponseContent.Instance.Error($"璐т綅缂栧彿銆恵LocationCode}銆戝凡绂佺敤锛岃鎭㈠姝ｅ父鍐嶄娇鐢�");
+ Dt_InventoryInfo inventoryInfo1 = _inventoryInfoService.Repository.QueryFirst(x => x.LocationCode == LocationCode);
+ if (inventoryInfo1 == null)
{
- WarehouseCode = cabinOrderDetail.Reservoirarea,
- BatchNo = inventoryInfo.BatchNo,
- MaterielName = inventoryInfo.MaterielName,
- MaterielCode = inventoryInfo.MaterielCode,
- MaterielSpec = inventoryInfo.MaterielSpec,
- TaskType = TaskTypeEnum.OutInventory.ObjToInt(),
- TaskStatus = SupplyStatusEnum.CheckFinish.ObjToInt(),
- CreateDate = DateTime.Now,
- Creater = App.User.UserName,
- LocationCode = LocationCode,
- OrderNo = cabinOrder.Out_no,
- StockQuantity = inventoryInfo.StockQuantity,
- SupplyQuantity = Inqty,
- Remark = "鐩樼偣"
- };
- _supplyTaskService.AddData(supplyTask);
+ location.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ _basicService.LocationInfoService.UpdateData(location);
+ }
#endregion
+
+ _supplyTaskService.UpdateData(supplyTask);
#region 搴撳瓨鎵规
Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode);
if (inventory_Batch != null)
{
- inventory_Batch.SupplyQuantity += Inqty;
- _inventory_BatchServices.UpdateData(inventory_Batch);
+ inventory_Batch.StockQuantity -= supplyTask.StockQuantity;
+ if (inventory_Batch.StockQuantity <= 0)
+ _inventory_BatchServices.DeleteData(inventory_Batch);
+ else
+ _inventory_BatchServices.UpdateData(inventory_Batch);
}
#endregion
_unitOfWorkManage.CommitTran();
#endregion
-
- content.OK(cabinOrderDetail.Order_Outqty.ToString());
+ content.OK();
}
catch (Exception ex)
{
@@ -1277,7 +1000,14 @@
}
return content;
}
- public WebResponseContent FeedbackOut(SaveModel saveModel)
+
+
+ /// <summary>
+ /// 骞冲簱浜哄伐鎷ｆ枡鍑哄簱澶勭悊锛堝嵆浜哄伐鎵爜鍑哄簱鏃惰皟鐢級
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ public WebResponseContent MatPicking(SaveModel saveModel)
{
WebResponseContent content = new WebResponseContent();
try
--
Gitblit v1.9.3