From 56827df8730c172c6c654fb78fed073ef8d694cb Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 23 十月 2025 19:22:39 +0800
Subject: [PATCH] 优化入库单处理
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 1347 ++++++++++++++++++++++++++++------------------------------
1 files changed, 646 insertions(+), 701 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..04a2ab7 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,14 @@
锘縰sing HslCommunication;
+using MailKit.Search;
+using Microsoft.Data.SqlClient;
+using Microsoft.IdentityModel.Tokens;
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;
@@ -49,28 +53,25 @@
/// <summary>
/// 鑾峰彇涓婃父鍑哄簱鍗� 0鎴愬姛1澶辫触
/// </summary>
- /// <param name="searchDate"></param>
- /// <returns></returns>
+ /// <param name = "searchDate" ></ param >
+ /// < returns ></ returns >
//public WebResponseContent GetUpstreamOutOrder()
//{
// var responseContent = new WebResponseContent();
// try
// {
- // // 璇锋眰鍦板潃
// var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
-
- // //if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ // //var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
+ // if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
// //// 璇锋眰鍙傛暟
// var requestData = new
// {
- // //searchDate = SearchDate
- // searchDate = "2022-10-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
+ // searchDate = SearchDate
+ // //searchDate = "2022-10-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
// };
- // //SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
- // // 鍙戣捣璇锋眰
- // var result = HttpHelper.Post(url, requestData.ToJsonString());
+ // SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
- // // 鍙嶅簭鍒楀寲
+ // var result = HttpHelper.Post(url, requestData.ToJsonString());
// var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);
// if (response.resultCode != "0")
@@ -83,80 +84,248 @@
// {
// return responseContent.OK("鏃犳柊鍑哄簱鍗曟暟鎹�");
// }
- // // 鑾峰彇鎵�鏈夊凡瀛樺湪鐨勫嚭搴撳崟鍙�
+
+ // // 宸插瓨鍦ㄥ嚭搴撳崟鍙�
// var existingOutOrderNos = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
// .Select(x => x.Out_no)
// .ToList();
- // // 杩囨护鎺夊凡瀛樺湪鐨勫嚭搴撳崟
+ // // 鏂板嚭搴撳崟
// var newOutOrders = response.data
- // .Where(outorder => !existingOutOrderNos.Contains(outorder.order_no))//order_no鍑哄簱鍗曞彿
+ // .Where(outorder => !existingOutOrderNos.Contains(outorder.order_no))
// .ToList();
+
+ // List<string> order_no = newOutOrders.Select(x => x.order_no).ToList();
// if (!newOutOrders.Any())
// {
// return responseContent.OK("鎵�鏈夊嚭搴撳崟宸插瓨鍦紝鏃犻渶鏂板");
// }
+
// Db.Ado.BeginTran();
// try
// {
// List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
- // ////瀛樺偍鍑哄簱鍗曞彿
- // //List<string> orderNos = new List<string>();
+ // List<string> orderNos = new List<string>();
// foreach (var outorder in newOutOrders)
// {
- // var entityOrder = new Dt_DeliveryOrder
- // {
- // Out_no = outorder.order_no,
- // Out_type = outorder.order_type,
- // Client_no = outorder.client_no,
- // Client_name = outorder.client_name,
- // Account_time = outorder.account_time,
- // Warehouse_no=outorder.warehouse_no,
- // OutStatus = "鏈畬鎴�",
- // //Details = outorder.details.Select(d => new Dt_DeliveryOrderDetail
- // //{
- // // // InsertNav 浼氳嚜鍔ㄨ缃叧鑱斿瓧娈� DeliveryOrderId
- // // Goods_no = d.goods_no,
- // // Order_qty = d.order_qty,
- // // Batch_num = d.batch_num,
- // // Exp_date = d.exp_date,
- // // OotDetailStatus = "鏂板缓",
- // // Status = outorder.warehouse_no == "001" ? 0 : 2, //濡傛灉鏄�001鎴块偅涔堝皢鐘舵�佽缃负0锛�2涓轰汉宸ュ鐞�
- // //}).ToList()
- // };
- // #region 鏍规嵁鍑哄簱鍗曡鎯呮煡鎵剧墿鏂欏悕绉般�佹壒娆＄殑搴撳瓨淇℃伅(Dt_InventoryInfo)锛涙牴鎹厛鍏ュ厛鍑�,CreateDate
- // //鏍规嵁鐗╂枡鍚嶇О鏌ユ壘鐗╂枡淇℃伅
- // foreach (var item in outorder.details)
- // {
- // // 灏嗕笂娓稿嚭搴撴暟閲忚浆涓烘鏁�
- // item.order_qty = Math.Abs(item.order_qty);
- // var medication = BaseDal.Db.Queryable<Dt_MedicineGoods>()
- // .Where(m => m.Goods_no == item.goods_no)
- // .First();
+ // bool skipOrder = false; // 鏍囪鏄惁璺宠繃璇ュ嚭搴撳崟
-
+ // // 濡傛灉杩欎釜鍑哄簱鍗曠被鍨嬩笉绛変簬1锛屽睘浜庡嚭搴撻��璐э紙瑕佸叆璐т笂娓镐紶杩囨潵鐨勬暟閲忎负璐熸暟锛�
+ // if (outorder.order_type != "1")
+ // {
+ // // 鍒涘缓鍑哄簱閫�璐у崟 - 杩欓噷闇�瑕佹牴鎹笟鍔￠�昏緫瀹炵幇
+ // // 鏆傛椂璺宠繃鎴栧疄鐜伴��璐ч�昏緫
+ // continue;
// }
+ // else if (outorder.order_type == "1") // 姝ｅ父鍑哄簱鍗�
+ // {
+ // // 鎺掗櫎鐗规畩鑽搧,鐗规畩鑽搧鐩存帴鎻掑叆
+ // if (outorder.warehouse_no != "001" && (outorder.warehouse_no == "010" || outorder.warehouse_no == "003" || outorder.warehouse_no == "017"))
+ // {
+ // var entityOrder = new Dt_DeliveryOrder
+ // {
+ // Out_no = outorder.order_no,
+ // Out_type = outorder.order_type,
+ // Client_no = outorder.client_no,
+ // Client_name = outorder.client_name,
+ // Account_time = outorder.account_time,
+ // Warehouse_no = outorder.warehouse_no,
+ // OutStatus = "鏂板缓",
+ // Details = outorder.details.Select(d => new Dt_DeliveryOrderDetail
+ // {
+ // Goods_no = d.goods_no,
+ // Order_qty = Math.Abs(d.order_qty), // 鍑哄簱鏁伴噺杞负姝ｆ暟
+ // Batch_num = d.batch_num,
+ // Exp_date = d.exp_date,
+ // OotDetailStatus = "鏂板缓",
+ // Status = 2, // pad骞冲簱锛屾棤闇�鍚屾
+ // }).ToList()
+ // };
+ // _DeliveryOrders.Add(entityOrder);
+ // }
+ // else // 甯歌鑽搧001鎴跨粰绔嬪簱,瑕佹槸鏈夋暣绠卞氨缁欏钩搴�
+ // {
+ // var entityOrder = new Dt_DeliveryOrder
+ // {
+ // Out_no = outorder.order_no,
+ // Out_type = outorder.order_type,
+ // Client_no = outorder.client_no,
+ // Client_name = outorder.client_name,
+ // Account_time = outorder.account_time,
+ // Warehouse_no = outorder.warehouse_no,
+ // OutStatus = "鏂板缓",
+ // Details = new List<Dt_DeliveryOrderDetail>()
+ // };
- // //鏍规嵁绠辫鍒ゆ柇鏄惁鏈夋暎浠讹紝璁＄畻鍑烘暎浠舵暟閲忓拰鏁翠欢鏁�
+ // // 閬嶅巻鍑哄簱鏄庣粏
+ // foreach (var item in outorder.details)
+ // {
+ // // 灏嗕笂娓稿嚭搴撴暟閲忚浆涓烘鏁�
+ // decimal orderQty = Math.Abs((decimal)item.order_qty);
- // //鏍规嵁鍏ュ簱鏃堕棿鍒嗙粍锛屾湁鏁ｄ欢灏变紭鍏堝垎閰嶇珛搴撴暟閲忥紝鏁翠欢浼樺厛鍒嗛厤骞冲簱鏁伴噺
+ // #region 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅
+ // var medication = BaseDal.Db.Queryable<Dt_MaterielInfo>()
+ // .Where(m => m.MaterielCode == item.goods_no)
+ // .First();
+ // // 濡傛灉鐗╂枡淇℃伅涓嶅瓨鍦紝璺宠繃鏁翠釜鍑哄簱鍗�
+ // if (medication == null)
+ // {
+ // skipOrder = true;
+ // Console.WriteLine($"璺冲嚭澶勫簱鍗� {outorder.order_no}锛屽師鍥狅細鏈壘鍒板晢鍝� [{item.goods_no}] 鐨勭墿鏂欎俊鎭��");
+ // break;
+ // }
- // #endregion
- // _DeliveryOrders.Add(entityOrder);
+ // // 鑻ョ墿鏂欎笉瀛樺湪鎴� MaterielSourceType 涓虹┖锛屽垯璺宠繃鏁翠釜鍑哄簱鍗�
+ // if (medication == null || !Enum.IsDefined(typeof(MaterielSourceTypeEnum), medication.MaterielSourceType))
+ // {
+ // skipOrder = true;
+ // break;
+ // }
+ // #endregion
- // };
+ // /// 鏍规嵁鐗╂枡淇℃伅澶у皬浠跺睘鎬у尯鍒嗘槸鍚︿粠绔嬪簱鍑哄簱 // 澶т欢浠庡钩搴撳嚭搴�
+ // if (medication.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart) // 濡傛灉鐗╂枡鏄ぇ浠�
+ // {
+ // var orderDetail = new Dt_DeliveryOrderDetail()
+ // {
+ // Reservoirarea = outorder.warehouse_no,
+ // Goods_no = item.goods_no,
+ // Order_qty = orderQty,
+ // Batch_num = item.batch_num,
+ // Exp_date = item.exp_date,
+ // OotDetailStatus = "鏂板缓",
+ // Status = 2 // 骞冲簱锛屾棤闇�鍚屾
+ // };
+ // entityOrder.Details.Add(orderDetail);
+ // }
+ // else
+ // {
+ // Dt_DeliveryOrderDetail orderDetail = null;
- // // 浣跨敤 InsertNav 涓�娆℃�ф彃鍏ヤ富琛ㄥ拰瀛愯〃鏁版嵁
- // BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();
+ // // 璁＄畻鏁寸鍜屾暎浠舵暟閲�
+ // var ys = orderQty % medication.BoxQty; // 涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
+ // var xs = (int)(orderQty / medication.BoxQty); // 鏁寸鏁伴噺锛堜繚鐣欐暣鏁帮級
- // // 杩欓噷鍙互娣诲姞涓嬪彂鍒� WCS 鐨勯�昏緫
- // // var result = EdiOut(); // 鍙戠粰涓嬫父
+ // #region 浠庣珛搴撳嚭搴撴暎浠�
+
+ // #region 鍒ゆ柇鏄惁鏈夋暎浠�
+ // if (ys > 0 && medication.Business_qty >= ys)
+ // {
+ // orderDetail = new Dt_DeliveryOrderDetail()
+ // {
+ // Reservoirarea = outorder.warehouse_no,
+ // Goods_no = item.goods_no,
+ // Order_qty = ys,
+ // Batch_num = item.batch_num,
+ // Exp_date = item.exp_date,
+ // OotDetailStatus = "鏂板缓",
+ // Status = 0 // 绔嬪簱锛岄渶瑕佸悓姝ョ粰WCS
+ // };
+ // medication.Business_qty -= ys;
+ // }
+ // else
+ // {
+ // // 绔嬪簱搴撳瓨涓嶈冻锛屾暎浠朵篃浠庡钩搴撳嚭
+ // orderDetail = new Dt_DeliveryOrderDetail()
+ // {
+ // Reservoirarea = outorder.warehouse_no,
+ // Goods_no = item.goods_no,
+ // Order_qty = ys,
+ // Batch_num = item.batch_num,
+ // Exp_date = item.exp_date,
+ // OotDetailStatus = "鏂板缓",
+ // Status = 2 // 骞冲簱
+ // };
+ // }
+ // #endregion
+
+ // #region 鍒ゆ柇绔嬪簱搴撳瓨鏄惁瓒冲鍑烘暣绠�
+ // while (medication.Business_qty >= medication.BoxQty && xs > 0)
+ // {
+ // xs--;
+ // if (orderDetail == null)
+ // {
+ // orderDetail = new Dt_DeliveryOrderDetail()
+ // {
+ // Reservoirarea = outorder.warehouse_no,
+ // Goods_no = item.goods_no,
+ // Order_qty = medication.BoxQty,
+ // Batch_num = item.batch_num,
+ // Exp_date = item.exp_date,
+ // OotDetailStatus = "鏂板缓",
+ // Status = 0 // 绔嬪簱
+ // };
+ // medication.Business_qty -= medication.BoxQty;
+ // }
+ // else
+ // {
+ // orderDetail.Order_qty += medication.BoxQty;
+ // medication.Business_qty -= medication.BoxQty;
+ // }
+ // }
+
+ // if (orderDetail != null)
+ // entityOrder.Details.Add(orderDetail);
+ // #endregion
+
+ // #endregion
+
+ // #region 鍓╀綑鏁翠欢浠庡钩搴撳嚭搴�
+ // if (xs > 0)
+ // {
+ // orderDetail = new Dt_DeliveryOrderDetail()
+ // {
+ // Reservoirarea = outorder.warehouse_no,
+ // Goods_no = item.goods_no,
+ // Order_qty = medication.BoxQty * xs,
+ // Batch_num = item.batch_num,
+ // Exp_date = item.exp_date,
+ // OotDetailStatus = "鏂板缓",
+ // Status = 2 // 骞冲簱
+ // };
+ // entityOrder.Details.Add(orderDetail);
+ // }
+ // #endregion
+ // }
+
+ // // 鏇存柊鐗╂枡淇℃伅
+ // _basicService.MaterielInfoService.Repository.UpdateData(medication);
+
+ // }
+
+ // // 濡傛灉璺宠繃璇ュ崟锛屽垯鐩存帴continue锛屼笉淇濆瓨
+ // if (skipOrder)
+ // {
+ // Console.WriteLine($"璺冲嚭澶勫簱鍗� {outorder.order_no}锛屽洜涓哄瓨鍦ㄦ湭瀹氫箟鐗╂枡灞炴�х殑鍟嗗搧銆�");
+ // continue;
+ // }
+
+ // // 纭繚鍑哄簱鍗曟湁鏄庣粏鎵嶆坊鍔�
+ // if (entityOrder.Details.Any())
+ // {
+ // _DeliveryOrders.Add(entityOrder);
+ // orderNos.Add(outorder.order_no);
+ // }
+ // }
+ // }
+ // }
+
+ // // 鎵归噺鎻掑叆鍑哄簱鍗曞拰鏄庣粏
+ // if (_DeliveryOrders.Any())
+ // {
+ // BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();
+ // }
// Db.Ado.CommitTran();
- // return responseContent.OK("鍚屾鍑哄簱鍗曟垚鍔�");
+ // var tex= CreateSupplyTask(order_no);
+ // if (!tex)
+ // {
+ // return responseContent.Error("鍒涘缓渚涘簲浠诲姟澶辫触");
+ // }
+ // return responseContent.OK($"鍚屾鍑哄簱鍗曟垚鍔燂紝鍏眥_DeliveryOrders.Count}鏉�");
// }
// catch (Exception ex)
// {
@@ -167,12 +336,10 @@
// }
// catch (Exception ex)
// {
- // // 鍏ㄥ眬寮傚父鏃讹紝涔熸帹閫佸紓甯哥粰涓婃父
// SendErrorToUpstream(3, "", ex.Message, "");
// return responseContent.Error("鍚屾澶辫触: " + ex.Message);
// }
//}
-
public WebResponseContent GetUpstreamOutOrder()
@@ -181,11 +348,15 @@
try
{
var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
-
+ //var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
+ if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ //// 璇锋眰鍙傛暟
var requestData = new
{
- searchDate = "2022-10-10 20:45:16"
+ searchDate = SearchDate
+ //searchDate = "2022-10-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
};
+ SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
var result = HttpHelper.Post(url, requestData.ToJsonString());
var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);
@@ -211,6 +382,8 @@
.Where(outorder => !existingOutOrderNos.Contains(outorder.order_no))
.ToList();
+ List<string> order_no = newOutOrders.Select(x => x.order_no).ToList();
+
if (!newOutOrders.Any())
{
return responseContent.OK("鎵�鏈夊嚭搴撳崟宸插瓨鍦紝鏃犻渶鏂板");
@@ -220,222 +393,214 @@
try
{
List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
+ List<string> orderNos = new List<string>();
foreach (var outorder in newOutOrders)
{
- var entityOrder = new Dt_DeliveryOrder
+ bool skipOrder = false; // 鏍囪鏄惁璺宠繃璇ュ嚭搴撳崟
+
+ // 濡傛灉杩欎釜鍑哄簱鍗曠被鍨嬩笉绛変簬1锛屽睘浜庡嚭搴撻��璐э紙瑕佸叆璐т笂娓镐紶杩囨潵鐨勬暟閲忎负璐熸暟锛�
+ if (outorder.order_type != "1")
{
- Out_no = outorder.order_no,
- Out_type = outorder.order_type,
- Client_no = outorder.client_no,
- Client_name = outorder.client_name,
- Account_time = outorder.account_time,
- Warehouse_no = outorder.warehouse_no,
- OutStatus = "鏈畬鎴�",
- Details = new List<Dt_DeliveryOrderDetail>()
- };
-
- // 閬嶅巻鍑哄簱鏄庣粏
- foreach (var item in outorder.details)
+ // 鍒涘缓鍑哄簱閫�璐у崟 - 杩欓噷闇�瑕佹牴鎹笟鍔￠�昏緫瀹炵幇
+ // 鏆傛椂璺宠繃鎴栧疄鐜伴��璐ч�昏緫
+ continue;
+ }
+ else if (outorder.order_type == "1") // 姝ｅ父鍑哄簱鍗�
{
- // 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)
- .First();
-
- if (medication == null)
+ // 鎺掗櫎鐗规畩鑽搧,鐗规畩鑽搧鐩存帴鎻掑叆
+ if (outorder.warehouse_no != "001" && (outorder.warehouse_no == "010" || outorder.warehouse_no == "003" || outorder.warehouse_no == "017"))
{
- SendErrorToUpstream(3, "", $"鎵句笉鍒扮墿鏂欎俊鎭細{item.goods_no}", "");
- continue;
- }
-
- decimal boxQty = medication.BoxQty <= 0 ? 1 : medication.BoxQty;
-
- // 3锔忊儯 璁＄畻鏁翠欢涓庢暎浠舵暟閲�
- var fullBoxes = (int)(orderQty / boxQty); // 鏁翠欢绠辨暟
- var partialQty = orderQty % boxQty; // 鏁ｄ欢鏁伴噺
-
- // 鑻ヤ笂娓哥粰浜嗘壒娆″彿锛屽垯浼樺厛鍖归厤
- string requestedBatch = string.IsNullOrEmpty(item.batch_num) ? null : item.batch_num;
-
- // helper: 鏌ヨ搴撳瓨鍑芥暟锛堟寜鍏ュ簱鏃堕棿鍗囧簭锛�
- Func<int, List<Dt_InventoryInfo>> queryInventoryByStockStatus = (stockStatus) =>
- {
- var q = BaseDal.Db.Queryable<Dt_InventoryInfo>()
- .Where(i => i.MaterielCode == item.goods_no &&
- (i.StockQuantity - i.OutboundQuantity) > 0 &&
- i.StockStatus == stockStatus);
-
- if (!string.IsNullOrEmpty(requestedBatch))
- q = q.Where(i => i.BatchNo == requestedBatch);
-
- return q.OrderBy(i => i.InDate).ToList();
- };
-
- // 4锔忊儯鍒嗛厤鏁ｄ欢锛堜紭鍏堢珛搴� Status=1锛�
- decimal remainingPartial = partialQty;
- if (remainingPartial > 0)
- {
- var invList_ly = queryInventoryByStockStatus(1);
- foreach (var inv in invList_ly)
+ var entityOrder = new Dt_DeliveryOrder
{
- 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
+ Out_no = outorder.order_no,
+ Out_type = outorder.order_type,
+ Client_no = outorder.client_no,
+ Client_name = outorder.client_name,
+ Account_time = outorder.account_time,
+ Warehouse_no = outorder.warehouse_no,
+ OutStatus = "鏂板缓",
+ Details = outorder.details.Select(d => new Dt_DeliveryOrderDetail
{
- Goods_no = item.goods_no,
- Order_qty = use,
- Batch_num = inv.BatchNo,
- Exp_date = inv.ValidityPeriod,
+ Goods_no = d.goods_no,
+ Order_qty = Math.Abs(d.order_qty), // 鍑哄簱鏁伴噺杞负姝ｆ暟
+ Batch_num = d.batch_num,
+ Exp_date = d.exp_date,
OotDetailStatus = "鏂板缓",
- Status = 0, //绔嬪簱
- Reservoirarea = inv.LocationCode
- };
- entityOrder.Details.Add(detail);
-
- inv.OutboundQuantity += use;
- BaseDal.Db.Updateable(inv).ExecuteCommand();
-
- remainingPartial -= use;
- }
-
- // 绔嬪簱涓嶅 鈫� 骞冲簱琛� (Status=2)
- if (remainingPartial > 0)
- {
- var invList_pk = queryInventoryByStockStatus(2);
- foreach (var inv in invList_pk)
- {
- 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
- {
- Goods_no = item.goods_no,
- Order_qty = use,
- Batch_num = inv.BatchNo,
- Exp_date = inv.ValidityPeriod,
- OotDetailStatus = "鏂板缓",
- Status = 2, //骞冲簱
- Reservoirarea = inv.LocationCode
- };
- entityOrder.Details.Add(detail);
-
- inv.OutboundQuantity += use;
- BaseDal.Db.Updateable(inv).ExecuteCommand();
-
- remainingPartial -= use;
- }
- }
-
- if (remainingPartial > 0)
- {
- SendErrorToUpstream(3, "", $"鍑哄簱鍗昜{outorder.order_no}]鐗╂枡[{item.goods_no}]鏁ｄ欢搴撳瓨涓嶈冻锛屾湭鍒嗛厤锛歿remainingPartial}", "");
- }
+ Status = 2, // pad骞冲簱锛屾棤闇�鍚屾
+ }).ToList()
+ };
+ _DeliveryOrders.Add(entityOrder);
}
-
- //鍒嗛厤鏁翠欢锛堜紭鍏堝钩搴� Status=2锛�
- int remainingFullBoxes = fullBoxes;
- if (remainingFullBoxes > 0)
+ else // 甯歌鑽搧001鎴跨粰绔嬪簱,瑕佹槸鏈夋暣绠卞氨缁欏钩搴�
{
- var invList_pk = queryInventoryByStockStatus(2);
- foreach (var inv in invList_pk)
+ var entityOrder = new Dt_DeliveryOrder
{
- if (remainingFullBoxes <= 0) break;
+ Out_no = outorder.order_no,
+ Out_type = outorder.order_type,
+ Client_no = outorder.client_no,
+ Client_name = outorder.client_name,
+ Account_time = outorder.account_time,
+ Warehouse_no = outorder.warehouse_no,
+ OutStatus = "鏂板缓",
+ Details = new List<Dt_DeliveryOrderDetail>()
+ };
- decimal available = (decimal)(inv.StockQuantity - inv.OutboundQuantity);
- if (available < boxQty) continue;
-
- int canProvideBoxes = (int)(available / boxQty);
- if (canProvideBoxes <= 0) continue;
-
- int useBoxes = Math.Min(canProvideBoxes, remainingFullBoxes);
- decimal useQty = useBoxes * boxQty;
-
- var detail = new Dt_DeliveryOrderDetail
- {
- Goods_no = item.goods_no,
- Order_qty = useQty,
- Batch_num = inv.BatchNo,
- Exp_date = inv.ValidityPeriod,
- OotDetailStatus = "鏂板缓",
- Status = 2, //骞冲簱
- Reservoirarea = inv.LocationCode
- };
- entityOrder.Details.Add(detail);
-
- inv.OutboundQuantity += useQty;
- BaseDal.Db.Updateable(inv).ExecuteCommand();
-
- remainingFullBoxes -= useBoxes;
- }
-
- // 骞冲簱涓嶅 鈫� 绔嬪簱琛� (Status=1)
- if (remainingFullBoxes > 0)
+ // 閬嶅巻鍑哄簱鏄庣粏
+ foreach (var item in outorder.details)
{
- var invList_ly = queryInventoryByStockStatus(1);
- foreach (var inv in invList_ly)
+ // 灏嗕笂娓稿嚭搴撴暟閲忚浆涓烘鏁�
+ decimal orderQty = Math.Abs((decimal)item.order_qty);
+
+ #region 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅
+ var medication = BaseDal.Db.Queryable<Dt_MaterielInfo>()
+ .Where(m => m.MaterielCode == item.goods_no)
+ .First();
+
+ // 濡傛灉鐗╂枡淇℃伅涓嶅瓨鍦紝璺宠繃鏁翠釜鍑哄簱鍗�
+ if (medication == null)
{
- if (remainingFullBoxes <= 0) break;
-
- decimal available = (decimal)(inv.StockQuantity - inv.OutboundQuantity);
- if (available < boxQty) continue;
-
- int canProvideBoxes = (int)(available / boxQty);
- if (canProvideBoxes <= 0) continue;
-
- int useBoxes = Math.Min(canProvideBoxes, remainingFullBoxes);
- decimal useQty = useBoxes * boxQty;
-
- var detail = new Dt_DeliveryOrderDetail
- {
- Goods_no = item.goods_no,
- Order_qty = useQty,
- Batch_num = inv.BatchNo,
- Exp_date = inv.ValidityPeriod,
- OotDetailStatus = "鏂板缓",
- Status = 0, //绔嬪簱锛堣ˉ鏁寸锛�
- Reservoirarea = inv.LocationCode
- };
- entityOrder.Details.Add(detail);
-
- inv.OutboundQuantity += useQty;
- BaseDal.Db.Updateable(inv).ExecuteCommand();
-
- remainingFullBoxes -= useBoxes;
+ skipOrder = true;
+ Console.WriteLine($"璺冲嚭澶勫簱鍗� {outorder.order_no}锛屽師鍥狅細鏈壘鍒板晢鍝� [{item.goods_no}] 鐨勭墿鏂欎俊鎭��");
+ break;
}
+
+ // 鑻ョ墿鏂欎笉瀛樺湪鎴� MaterielSourceType 涓虹┖锛屽垯璺宠繃鏁翠釜鍑哄簱鍗�
+ if (medication == null || !Enum.IsDefined(typeof(MaterielSourceTypeEnum), medication.MaterielSourceType))
+ {
+ skipOrder = true;
+ break;
+ }
+ #endregion
+
+ /// 鏍规嵁鐗╂枡淇℃伅澶у皬浠跺睘鎬у尯鍒嗘槸鍚︿粠绔嬪簱鍑哄簱 // 澶т欢浠庡钩搴撳嚭搴�
+ if (medication.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart) // 濡傛灉鐗╂枡鏄ぇ浠�
+ {
+ var orderDetail = new Dt_DeliveryOrderDetail()
+ {
+ Reservoirarea = outorder.warehouse_no,
+ Goods_no = item.goods_no,
+ Order_qty = orderQty,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OotDetailStatus = "鏂板缓",
+ Status = 2 // 骞冲簱锛屾棤闇�鍚屾
+ };
+ entityOrder.Details.Add(orderDetail);
+ }
+ else
+ {
+ Dt_DeliveryOrderDetail orderDetail = null;
+
+ // 璁＄畻鏁寸鍜屾暎浠舵暟閲�
+ var ys = orderQty % medication.BoxQty; // 涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
+ var xs = (int)(orderQty / medication.BoxQty); // 鏁寸鏁伴噺锛堜繚鐣欐暣鏁帮級
+
+ #region 浠庣珛搴撳嚭搴撴暎浠�
+
+ #region 鍒ゆ柇鏄惁鏈夋暎浠�
+ if (ys > 0 && medication.Business_qty >= ys)
+ {
+ orderDetail = new Dt_DeliveryOrderDetail()
+ {
+ Reservoirarea = outorder.warehouse_no,
+ Goods_no = item.goods_no,
+ Order_qty = ys,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OotDetailStatus = "鏂板缓",
+ Status = 0 // 绔嬪簱锛岄渶瑕佸悓姝ョ粰WCS
+ };
+ medication.Business_qty -= ys;
+ }
+ #endregion
+
+ #region 鍒ゆ柇绔嬪簱搴撳瓨鏄惁瓒冲鍑烘暣绠�
+ while (medication.Business_qty >= medication.BoxQty && xs > 0)
+ {
+ xs--;
+ if (orderDetail == null)
+ {
+ orderDetail = new Dt_DeliveryOrderDetail()
+ {
+ Reservoirarea = outorder.warehouse_no,
+ Goods_no = item.goods_no,
+ Order_qty = medication.BoxQty,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OotDetailStatus = "鏂板缓",
+ Status = 0 // 绔嬪簱
+ };
+ medication.Business_qty -= medication.BoxQty;
+ }
+ else
+ {
+ orderDetail.Order_qty += medication.BoxQty;
+ medication.Business_qty -= medication.BoxQty;
+ }
+ }
+
+ if (orderDetail != null)
+ entityOrder.Details.Add(orderDetail);
+ #endregion
+
+ #endregion
+
+ #region 鍓╀綑鏁翠欢浠庡钩搴撳嚭搴�
+ if (xs > 0)
+ {
+ orderDetail = new Dt_DeliveryOrderDetail()
+ {
+ Reservoirarea = outorder.warehouse_no,
+ Goods_no = item.goods_no,
+ Order_qty = medication.BoxQty * xs,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OotDetailStatus = "鏂板缓",
+ Status = 2 // 骞冲簱
+ };
+ entityOrder.Details.Add(orderDetail);
+ }
+ #endregion
+ }
+
+ // 鏇存柊鐗╂枡淇℃伅
+ _basicService.MaterielInfoService.Repository.UpdateData(medication);
+
}
- if (remainingFullBoxes > 0)
+ // 濡傛灉璺宠繃璇ュ崟锛屽垯鐩存帴continue锛屼笉淇濆瓨
+ if (skipOrder)
{
- decimal unfilledQty = remainingFullBoxes * boxQty;
- SendErrorToUpstream(3, "", $"鍑哄簱鍗昜{outorder.order_no}]鐗╂枡[{item.goods_no}]鏁寸搴撳瓨涓嶈冻锛屾湭鍒嗛厤鏁伴噺锛歿unfilledQty}", "");
+ Console.WriteLine($"璺冲嚭澶勫簱鍗� {outorder.order_no}锛屽洜涓哄瓨鍦ㄦ湭瀹氫箟鐗╂枡灞炴�х殑鍟嗗搧銆�");
+ continue;
+ }
+
+ // 纭繚鍑哄簱鍗曟湁鏄庣粏鎵嶆坊鍔�
+ if (entityOrder.Details.Any())
+ {
+ _DeliveryOrders.Add(entityOrder);
+ orderNos.Add(outorder.order_no);
}
}
}
-
- _DeliveryOrders.Add(entityOrder);
}
- // 鎻掑叆涓昏〃+鏄庣粏
- BaseDal.Db.InsertNav(_DeliveryOrders)
- .Include(x => x.Details)
- .ExecuteCommand();
+ // 鎵归噺鎻掑叆鍑哄簱鍗曞拰鏄庣粏
+ if (_DeliveryOrders.Any())
+ {
+ BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();
+ }
+ //涓嬪彂鍑哄簱鍗曚换鍔＄粰wcs
+
Db.Ado.CommitTran();
- return responseContent.OK("鍚屾鍑哄簱鍗曟垚鍔�");
+ var tex = CreateSupplyTask(order_no);
+ if (!tex)
+ {
+ return responseContent.Error("鍒涘缓渚涘簲浠诲姟澶辫触");
+ }
+ return responseContent.OK($"鍚屾鍑哄簱鍗曟垚鍔燂紝鍏眥_DeliveryOrders.Count}鏉�");
}
catch (Exception ex)
{
@@ -449,6 +614,113 @@
SendErrorToUpstream(3, "", ex.Message, "");
return responseContent.Error("鍚屾澶辫触: " + ex.Message);
}
+ }
+
+
+ /// <summary>
+ /// 鐢熸垚鍑哄簱鍗曚换鍔�
+ /// </summary>
+ /// <param name="order_no">鍑哄簱鍗曞彿</param>
+ /// <returns></returns>
+ private bool CreateSupplyTask(List<string> order_no)
+ {
+ try
+ {
+ // 鍏堣幏鍙栫鍚堟潯浠剁殑涓昏〃鏁版嵁
+ var mainOrders = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
+ .Where(x => order_no.Contains(x.Out_no))
+ .ToList();
+
+ // 鑾峰彇鎵�鏈変富琛↖D
+ var mainOrderIds = mainOrders.Select(x => x.Id).ToList();
+
+ // 鐩存帴鏌ヨ瀛愯〃鏁版嵁
+ List<Dt_DeliveryOrderDetail> filteredDetails = BaseDal.Db.Queryable<Dt_DeliveryOrderDetail>()
+ .Where(d => mainOrderIds.Contains(d.DeliveryOrderId) && d.OotDetailStatus == "鏂板缓")
+ .ToList();
+
+ // 鑾峰彇鎵�鏈夐渶瑕佹煡璇㈢殑鐗╂枡缂栫爜
+ var materielCodes = filteredDetails.Select(x => x.Goods_no).Distinct().ToList();
+
+ // 鎵归噺鏌ヨ鐗╂枡淇℃伅
+ var materielList = BaseDal.Db.Queryable<Dt_MaterielInfo>()
+ .Where(x => materielCodes.Contains(x.MaterielCode))
+ .ToList();
+
+ List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
+
+ foreach (var item in filteredDetails)
+ {
+ // 鏍规嵁瀛愯〃鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅
+ var medication = materielList.FirstOrDefault(x => x.MaterielCode == item.Goods_no);
+
+ // 鏌ユ壘瀵瑰簲鐨勪富琛ㄤ俊鎭�
+ var mainOrder = mainOrders.FirstOrDefault(x => x.Id == item.DeliveryOrderId);
+ //闅忔満鐢熸垚浠诲姟缂栧彿鍔犳椂闂存埑
+
+
+ if (mainOrder == null) continue;
+
+ var location = Db.Queryable<Dt_InventoryInfo>()
+ .Where(x => x.MaterielCode == ""//materielCode
+ && x.BatchNo == ""//batchNo
+ && x.StockQuantity > 0)
+ .OrderBy(x => x.InDate) // 鎸夊叆搴撴椂闂存帓搴�
+ .First();
+
+ var supplyTask = new Dt_SupplyTask
+ {
+ TaskNum = GenerateTaskNumber(),
+ PalletCode = "0",
+ BatchNo = item.Batch_num,
+ MaterielCode = item.Goods_no,
+ MaterielName = medication?.MaterielName, // 濡傛灉鐗╂枡淇℃伅涓嶅瓨鍦紝浣跨敤瀛愯〃鐨勭墿鏂欏悕绉�
+ MaterielSpec = medication?.MaterielSpec, // 濡傛灉鐗╂枡淇℃伅涓嶅瓨鍦紝浣跨敤瀛愯〃鐨勭墿鏂欒鏍�
+ TaskType = 0,
+ TaskStatus = item.Status == 0 ? 0 : 1,
+ WarehouseCode = mainOrder.Warehouse_no,
+ LocationCode = item.Status == 0 ? "绔嬪簱" : "骞冲簱",
+ StockQuantity = item.Order_qty, // 鍋囪瀛愯〃鏈塓uantity瀛楁
+ SupplyQuantity = 0,
+ OrderNo = mainOrder.Out_no,
+ Dispatchertime = DateTime.Now,
+ Remark = ""
+ };
+
+ supplyTasks.Add(supplyTask);
+ }
+
+ // 鎵归噺鎻掑叆渚涘簲浠诲姟
+ if (supplyTasks.Any())
+ {
+ return BaseDal.Db.Insertable(supplyTasks).ExecuteCommand() > 0;
+ }
+
+ return false;
+ }
+ catch (Exception ex)
+ {
+ // 璁板綍鏃ュ織
+ Console.WriteLine($"鍒涘缓渚涘簲浠诲姟澶辫触锛歿ex.Message}");
+ return false;
+ }
+ }
+
+
+
+ /// <summary>
+ /// 鐢熸垚闅忔満浠诲姟缂栧彿锛堥殢鏈烘暟 + 鏃堕棿鎴筹級
+ /// </summary>
+ /// <returns>浠诲姟缂栧彿</returns>
+ private int GenerateTaskNumber()
+ {
+ // 鐢熸垚4浣嶉殢鏈烘暟
+ Random random = new Random(Guid.NewGuid().GetHashCode());
+ int randomNum = random.Next(1000, 9999); // 1000-9999涔嬮棿鐨勯殢鏈烘暟
+
+
+ // 缁勫悎鎴愪换鍔＄紪鍙凤細TASK + 鏃堕棿鎴� + 闅忔満鏁�
+ return randomNum;
}
@@ -486,10 +758,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
@@ -497,15 +769,15 @@
customerCode = "905",
materialCode = materialCode,
externalOrderNo = order.Out_no,
- outOrderType = order.Out_type == "1" ? "10" : order.Out_type == "2" ? "20" : "30",
+ outOrderType = order.Out_type == "1" ? "10" : order.Out_type == "3" ? "20" : "30",//鍑哄簱鍗曠被鍨嬫槸1灏辨槸姝ｅ父鐨勶紝3灏辨槸鐩樼偣
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,
+ productName = d.MedicineGoods?.MaterielName,
+ productSpecifications = d.MedicineGoods?.MaterielModel,
quantity = (int)d.Order_qty,
//stocktakingDetails = order.Out_type == "3"
// ? new List<ToOutediInStock>
@@ -518,6 +790,8 @@
// 4. 璋冪敤鎺ュ彛
var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
+ //var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363076920";
+
var result = HttpHelper.Post(url, ediDto.ToJsonString());
var resp = JsonConvert.DeserializeObject<TowcsDto.TowcsResponse<object>>(result);
@@ -531,10 +805,9 @@
// 鏇存柊鏄庣粏鐘舵��
BaseDal.Db.Updateable<Dt_DeliveryOrderDetail>()
- .SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1, OotDetailStatus = "宸插畬鎴�" })
+ .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 +834,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 +1039,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,34 +1068,12 @@
}
}
- 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;
- }
-
+ /// <summary>
+ /// 鏌ヨ鍑哄簱鍗曞垪琛�
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
public WebResponseContent GetDeliveryOrders(SaveModel saveModel)
{
WebResponseContent content = new WebResponseContent();
@@ -1160,7 +1089,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 +1102,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 +1117,35 @@
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();
+ List<Dt_DeliveryOrderDetail>? cabinOrderDetails = cabinOrder.Details?.Where(x => x.Status == 2).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 +1162,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 +1215,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