From 7ec2fdc761acd483a621c590fae3a60af7b464ba Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 04 十一月 2025 15:17:08 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 1897 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 1,051 insertions(+), 846 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 8a41ce8..fdb77d2 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,6 +1,10 @@
锘縰sing HslCommunication;
using MailKit.Search;
+using Microsoft.Data.SqlClient;
+using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json;
+using OfficeOpenXml.Style;
+using Org.BouncyCastle.Asn1.X509;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -9,12 +13,15 @@
using WIDESEA_Common;
using WIDESEA_Common.LocationEnum;
using WIDESEA_Common.OrderEnum;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
+using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
+using WIDESEA_DTO.Outbound;
using WIDESEA_DTO.SquareCabin;
using WIDESEA_IBasicService;
using WIDESEA_ISquareCabinServices;
@@ -28,601 +35,916 @@
{
public partial class DeliveryOrderServices : ServiceBase<Dt_DeliveryOrder, IRepository<Dt_DeliveryOrder>>, IDeliveryOrderServices
{
- static string SearchDate = "";
- private readonly IBasicService _basicService;
+ private readonly ICabinOrderServices _cabinOrderServices;
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IInventory_BatchServices _inventory_BatchServices;
+ private readonly ILocationInfoService _locationInfoService;
private readonly IInventoryInfoService _inventoryInfoService;
private readonly IDeliveryOrderDetailServices _deliveryOrderDetailServices;
private readonly ISupplyTaskService _supplyTaskService;
- private readonly ICabinOrderServices _cabinOrderServices;
+ private readonly ISupplyTaskHtyService _supplyTaskHtyService;
+ private readonly ITacticsService _tacticsService;
+ private readonly IMaterielInfoService _materielInfoService;
+ private readonly IMessageInfoService _messageInfoService;
public IRepository<Dt_DeliveryOrder> Repository => BaseDal;
- public DeliveryOrderServices(IRepository<Dt_DeliveryOrder> BaseDal, IBasicService basicService, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices) : base(BaseDal)
+ public DeliveryOrderServices(IRepository<Dt_DeliveryOrder> BaseDal, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices, ITacticsService tacticsService, ISupplyTaskHtyService supplyTaskHtyService, IMessageInfoService messageInfoService, IMaterielInfoService materielInfoService, ILocationInfoService locationInfoService) : base(BaseDal)
{
- _basicService = basicService;
_unitOfWorkManage = unitOfWorkManage;
_deliveryOrderDetailServices = deliveryOrderDetailServices;
_supplyTaskService = supplyTaskService;
_inventory_BatchServices = inventory_BatchServices;
_inventoryInfoService = inventoryInfoService;
_cabinOrderServices = cabinOrderServices;
+ _tacticsService = tacticsService;
+ _supplyTaskHtyService = supplyTaskHtyService;
+ _messageInfoService = messageInfoService;
+ _materielInfoService = materielInfoService;
+ _locationInfoService = locationInfoService;
}
-
- /// <summary>
- /// 鑾峰彇涓婃父鍑哄簱鍗� 0鎴愬姛1澶辫触
- /// </summary>
- /// <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 requestData = new
- // {
- // //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);
-
- // if (response.resultCode != "0")
- // {
- // SendErrorToUpstream(3, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
- // return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
- // }
-
- // if (response.data == null || !response.data.Any())
- // {
- // 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鍑哄簱鍗曞彿
- // .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>();
-
- // 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();
-
-
- // }
-
- // //鏍规嵁绠辫鍒ゆ柇鏄惁鏈夋暎浠讹紝璁＄畻鍑烘暎浠舵暟閲忓拰鏁翠欢鏁�
-
- // //鏍规嵁鍏ュ簱鏃堕棿鍒嗙粍锛屾湁鏁ｄ欢灏变紭鍏堝垎閰嶇珛搴撴暟閲忥紝鏁翠欢浼樺厛鍒嗛厤骞冲簱鏁伴噺
-
-
- // #endregion
- // _DeliveryOrders.Add(entityOrder);
-
- // };
-
- // // 浣跨敤 InsertNav 涓�娆℃�ф彃鍏ヤ富琛ㄥ拰瀛愯〃鏁版嵁
- // BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();
-
- // // 杩欓噷鍙互娣诲姞涓嬪彂鍒� WCS 鐨勯�昏緫
- // // var result = EdiOut(); // 鍙戠粰涓嬫父
-
- // Db.Ado.CommitTran();
- // return responseContent.OK("鍚屾鍑哄簱鍗曟垚鍔�");
- // }
- // catch (Exception ex)
- // {
- // Db.Ado.RollbackTran();
- // SendErrorToUpstream(3, "", ex.Message, "");
- // return responseContent.Error("鍚屾澶辫触: " + ex.Message);
- // }
- // }
- // catch (Exception ex)
- // {
- // // 鍏ㄥ眬寮傚父鏃讹紝涔熸帹閫佸紓甯哥粰涓婃父
- // SendErrorToUpstream(3, "", ex.Message, "");
- // return responseContent.Error("鍚屾澶辫触: " + ex.Message);
- // }
- //}
-
-
- /// <summary>
- /// 杩囨护娌℃湁瀵瑰晢鍝佽繘琛岀淮鎶ょ殑鍑哄簱鍗曡繘琛岃繃婊�
- /// </summary>
- /// <returns></returns>
- public WebResponseContent GetUpstreamOutOrder()
+ public override WebResponseContent UpdateData(SaveModel saveModel)
{
- var responseContent = new WebResponseContent();
try
{
- var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
-
- var requestData = new
+ int id = saveModel.MainData["id"].ObjToInt();
+ var warehouse_no = saveModel.MainData["warehouse_no"].ToString();
+ var out_no = saveModel.MainData["out_no"].ToString();
+ //OutboundOrderAddDTO outboundOrder = saveModel.MainData.DicToModel<OutboundOrderAddDTO>();
+ //Dt_DeliveryOrder deliveryOrder = BaseDal.QueryFirst(x => x.Id == id);
+ List<DeliveryOrderDetailAddDTO> orderDetailAddDTOs = saveModel.DetailData.DicToIEnumerable<DeliveryOrderDetailAddDTO>();
+ orderDetailAddDTOs = orderDetailAddDTOs.Where(x => x.id == 0).ToList();
+ if (orderDetailAddDTOs.Count < 1) return WebResponseContent.Instance.OK();
+ if (orderDetailAddDTOs.Where(x => string.IsNullOrEmpty(x.locationCode)).Any()) return WebResponseContent.Instance.Error("璐т綅鍙蜂负蹇呭～瀛楁!");
+ if (orderDetailAddDTOs.Where(x => string.IsNullOrEmpty(x.exp_date)).Any()) return WebResponseContent.Instance.Error("鏁堟湡涓哄繀濉瓧娈�!");
+ var LocationCodes = orderDetailAddDTOs.Select(x => x.locationCode);
+ List<Dt_LocationInfo> locationInfos = _locationInfoService.Repository.QueryData(x => x.WarehouseCode == warehouse_no && LocationCodes.Contains(x.LocationCode));
+ var diff = LocationCodes.Except(locationInfos.Select(x => x.LocationCode)).ToArray();
+ if (diff.Length > 0) return WebResponseContent.Instance.Error($"璐т綅缂栧彿銆恵string.Join(", ", diff)}銆戜笉灞炰簬褰撳墠搴撴埧");
+ var array1 = orderDetailAddDTOs.Select(x => x.goods_no);
+ var MaterielInfos = _materielInfoService.Repository.QueryData(x => array1.Contains(x.MaterielCode));
+ var array2 = MaterielInfos.Select(x => x.MaterielCode);
+ diff = array1.Except(array2).ToArray();
+ if (diff.Length > 0) return WebResponseContent.Instance.Error($"璇风淮鎶ょ墿鏂欑紪鍙枫�恵string.Join(", ", diff)}銆戠殑鐗╂枡淇℃伅");
+ if (warehouse_no == WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"))
{
- searchDate = "2022-10-10 20:45:16"
- };
-
- var result = HttpHelper.Post(url, requestData.ToJsonString());
- var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);
-
- if (response.resultCode != "0")
- {
- SendErrorToUpstream(3, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
- return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
- }
-
- if (response.data == null || !response.data.Any())
- {
- 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))
- .ToList();
-
- if (!newOutOrders.Any())
- {
- return responseContent.OK("鎵�鏈夊嚭搴撳崟宸插瓨鍦紝鏃犻渶鏂板");
- }
-
- Db.Ado.BeginTran();
- try
- {
- List<Dt_DeliveryOrder> _DeliveryOrders = new List<Dt_DeliveryOrder>();
- List<string> orderNos = new();
-
- foreach (var outorder in newOutOrders)
+ var MaterielInfos1 = MaterielInfos.Where(x => x.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart).ToList();
+ if (MaterielInfos1.Count > 0)
{
-
- bool skipOrder = false; // 鏍囪鏄惁璺宠繃璇ュ叆搴撳崟
- 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)
- {
- // 1锔忊儯 杞负姝ｆ暟锛堜笂娓稿彲鑳戒紶璐熸暟锛�
- item.order_qty = Math.Abs(item.order_qty);
-
- //鍑哄簱鏁伴噺
- decimal orderQty = (decimal)item.order_qty;
-
- // 2锔忊儯 鏌ョ墿鏂欏熀纭�淇℃伅锛堣幏鍙栫瑙勶級
- 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锔忊儯 璁＄畻鏁翠欢涓庢暎浠舵暟閲�
- var fullBoxes = (int)(orderQty / boxQty); // 鏁翠欢绠辨暟
- var partialQty = orderQty % boxQty; // 鏁ｄ欢鏁伴噺
-
- // 鑻ヤ笂娓哥粰浜嗘壒娆″彿锛屽垯浼樺厛鍖归厤
- string requestedBatch = string.IsNullOrEmpty(item.batch_num) ? null : item.batch_num;
-
- // helper: 鏌ヨ搴撳瓨鍑芥暟锛堟寜鍏ュ簱鏃堕棿鍗囧簭锛�
- #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);
-
- 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();
- };
- #endregion
- // 4锔忊儯鍒嗛厤鏁ｄ欢锛堜紭鍏堢珛搴� WarehouseCode == "001锛�
- decimal remainingPartial = partialQty; //鏁ｄ欢
- if (remainingPartial > 0)
- {
- //杩斿洖涓�涓狶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
- {
- Goods_no = item.goods_no,
- Order_qty = use,
- Batch_num = inv.BatchNo,
- Exp_date = inv.ValidityPeriod,
- OotDetailStatus = "鏂板缓",
- Status = 0, //绔嬪簱
- Reservoirarea = inv.WarehouseCode
- };
- entityOrder.Details.Add(detail);
-
- inv.OutboundQuantity += use;
- BaseDal.Db.Updateable(inv).ExecuteCommand();
-
- remainingPartial -= use;
- }
-
- // 绔嬪簱涓嶅 鈫� 骞冲簱琛� (Status=2)
- if (remainingPartial > 0)
- {
- var invList_pk = queryInventoryByWarehouseType(false); //骞冲簱
- 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.WarehouseCode
- };
- 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锛�
- int remainingFullBoxes = fullBoxes;//鏁翠欢绠辨暟
- if (remainingFullBoxes > 0)
- {
- var invList_pk = queryInventoryByWarehouseType(true);
- foreach (var inv in invList_pk)
- {
- 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 = 2, //骞冲簱
- Reservoirarea = inv.WarehouseCode
- };
- entityOrder.Details.Add(detail);
-
- inv.OutboundQuantity += useQty;
- BaseDal.Db.Updateable(inv).ExecuteCommand();
-
- remainingFullBoxes -= useBoxes;
- }
-
- // 骞冲簱涓嶅 鈫� 绔嬪簱琛� (Status=0)
- if (remainingFullBoxes > 0)
- {
- var invList_ly = queryInventoryByWarehouseType(true); //绔嬪簱
- foreach (var inv in invList_ly)
- {
- 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;
- }
- }
- // 鉂楀鏋滆烦杩囪鍗曪紝鍒欑洿鎺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}", "");
- }
-
- }
- }
-
- _DeliveryOrders.Add(entityOrder);
+ return WebResponseContent.Instance.Error($"鐗╂枡缂栧彿銆恵string.Join(", ", MaterielInfos1.Select(x => x.MaterielCode))}銆戠殑鐗╂枡灞炴�у垎绫讳负澶т欢锛屼笉鍙叆绔嬪簱");
}
-
- // 鎻掑叆涓昏〃+鏄庣粏
- BaseDal.Db.InsertNav(_DeliveryOrders)
- .Include(x => x.Details)
- .ExecuteCommand();
-
- Db.Ado.CommitTran();
- return responseContent.OK("鍚屾鍑哄簱鍗曟垚鍔�");
}
- catch (Exception ex)
+ var InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.WarehouseCode == warehouse_no && array2.ToList().Contains(x.MaterielCode));
+ var Batchs = _inventory_BatchServices.Repository.QueryData(x => array2.Contains(x.MaterielCode));
+ List<Dt_DeliveryOrderDetail> deliveryOrderDetails = new List<Dt_DeliveryOrderDetail>();
+ List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
+ List<Dt_InventoryInfo> inventoryInfos = new List<Dt_InventoryInfo>();
+ List<Dt_Inventory_Batch> inventory_Batches = new List<Dt_Inventory_Batch>();
+ foreach (var item in orderDetailAddDTOs)
{
- Db.Ado.RollbackTran();
- SendErrorToUpstream(3, "", ex.Message, "");
- return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+ if (InventoryInfos.Where(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num).Any())
+ return WebResponseContent.Instance.Error($"鐗╂枡缂栧彿銆恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戝凡瀛樺湪搴撳瓨");
+ #region 娣诲姞鐩樼偣鍗曡鎯�
+ Dt_DeliveryOrderDetail dt_DeliveryOrde = new Dt_DeliveryOrderDetail()
+ {
+ DeliveryOrderId = id,
+ Reservoirarea = warehouse_no,
+ Status = 2,
+ Order_qty = 0,
+ Order_Outqty = item.order_Outqty,
+ Goods_no = item.goods_no,
+ OotDetailStatus = "鏂板缓",
+ Batch_num = item.batch_num,
+ Creater = App.User.UserName,
+ CreateDate = DateTime.Now,
+ };
+ deliveryOrderDetails.Add(dt_DeliveryOrde);
+ #endregion
+
+ #region 娣诲姞搴撳瓨銆佹壒娆′俊鎭�佺洏鐐逛换鍔�
+ var MaterielInfo = MaterielInfos.First(x => x.MaterielCode == item.goods_no);
+ Dt_InventoryInfo inventoryInfo = new Dt_InventoryInfo()
+ {
+ BatchNo = item.batch_num,
+ MaterielCode = MaterielInfo.MaterielCode,
+ AvailableQuantity = 0,
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ InDate = DateTime.Now,
+ LocationCode = item.locationCode,
+ MaterielName = MaterielInfo.MaterielName,
+ MaterielSpec = MaterielInfo.MaterielSpec,
+ OutboundQuantity = 0,
+ StockQuantity = 0,
+ StockStatus = StockStatusEmun.鐩樼偣閿佸畾.ObjToInt(),
+ SupplyQuantity = 0,
+ WarehouseCode = warehouse_no,
+ ValidityPeriod = item.exp_date
+ };
+ inventoryInfos.Add(inventoryInfo);
+ Dt_Inventory_Batch? inventory_Batch = Batchs.FirstOrDefault(x => x.BatchNo == item.batch_num && x.MaterielCode == item.goods_no);
+ if (inventory_Batch == null)
+ {
+ inventory_Batch = new Dt_Inventory_Batch()
+ {
+ BatchNo = inventoryInfo.BatchNo,
+ CreateDate = inventoryInfo.CreateDate,
+ Creater = inventoryInfo.Creater,
+ MaterielCode = inventoryInfo.MaterielCode,
+ ERPStockQuantity = 0,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ OutboundQuantity = inventoryInfo.OutboundQuantity,
+ ProductionDate = inventoryInfo.ProductionDate,
+ Status = false,
+ StockQuantity = inventoryInfo.StockQuantity,
+ AvailableQuantity = inventoryInfo.AvailableQuantity,
+ ValidityPeriod = inventoryInfo.ValidityPeriod.ObjToDate(),
+ SupplyQuantity = inventoryInfo.SupplyQuantity,
+ };
+ inventory_Batches.Add(inventory_Batch);
+ }
+ Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ {
+ WarehouseCode = warehouse_no,
+ TaskStatus = SupplyStatusEnum.NewCheck.ObjToInt(),
+ BatchNo = inventoryInfo.BatchNo,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ TaskType = TaskTypeEnum.OutInventory.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ LocationCode = inventoryInfo.LocationCode,
+ OrderNo = out_no,
+ StockQuantity = inventoryInfo.StockQuantity,
+ SupplyQuantity = 0,
+ Remark = "鐩樼偣"
+ };
+ supplyTasks.Add(supplyTask);
+ #endregion
}
+ _unitOfWorkManage.BeginTran();
+ _deliveryOrderDetailServices.AddData(deliveryOrderDetails);
+ _inventoryInfoService.AddData(inventoryInfos);
+ if (inventory_Batches.Count > 0) _inventory_BatchServices.AddData(inventory_Batches);
+ _supplyTaskService.AddData(supplyTasks);
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK("鐩樼偣璇︽儏娣诲姞鎴愬姛,璇烽�氳繃ERP骞宠处锛�");
}
catch (Exception ex)
{
- SendErrorToUpstream(3, "", ex.Message, "");
- return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+ _unitOfWorkManage.RollbackTran();
+ return WebResponseContent.Instance.Error(ex.Message);
}
}
+ #region 鍒涘缓鍑哄簱鍗�
/// <summary>
- /// 鍑哄簱鍗曟帹閫佺粰 WCS
+ /// 鍒涘缓鍑哄簱鍗�
/// </summary>
+ /// <param name="outorder"></param>
/// <returns></returns>
- public WebResponseContent EdiOut()
+ public WebResponseContent CreateOutboundOrder(UpstramOutOrderInfo outorder)
{
- var responseContent = new WebResponseContent();
+ WebResponseContent webResponseContent = new WebResponseContent();
try
{
- // 1. 鏌ヨ绗﹀悎鏉′欢鐨勮鍗曪紙琛ㄥご=鏂板缓 && 鍖呭惈鏈夋晥鏄庣粏锛�
- var outOrders = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>()
- .Where(o => o.OutStatus == "鏂板缓")
- .Includes(o => o.Details, d => d.MedicineGoods)
- .ToList();
-
- // 2. 鍐嶈繃婊ゆ帀涓嶇鍚堟潯浠剁殑鏄庣粏锛堝彧淇濈暀 Status=0 锛�
- foreach (var order in outOrders)
+ Dt_Tactics tactics = _tacticsService.Repository.QueryFirst(x => x.TacticeName == "鍑哄簱绛栫暐");
+ #region 鐗规畩搴撴埧鍑哄簱
+ string WareCodeMJ = WarehouseEnum.楹荤簿搴�.ObjToInt().ToString("000");
+ string WareCodeLD = WarehouseEnum.鍐峰喕搴�.ObjToInt().ToString("000");
+ if (outorder.warehouse_no == WareCodeMJ || outorder.warehouse_no == WareCodeLD)
{
- order.Details = order.Details.Where(d => d.Status == 0).ToList();
- }
-
- if (outOrders == null || !outOrders.Any())
- {
- Console.WriteLine("娌℃湁绗﹀悎鏉′欢鐨勮鍗曢渶瑕佹帹閫�");
- return responseContent.Error("娌℃湁绗﹀悎鏉′欢鐨勮鍗曢渶瑕佹帹閫�");
- }
-
- foreach (var order in outOrders)
- {
- try
+ #region 娣诲姞鍑哄簱鍗�
+ var entityOrder = new Dt_DeliveryOrder
{
- string materialCode = "YY";//榛樿鍊�
- //鑾峰彇褰撳墠璁㈠崟鐨勭涓�涓槑缁嗛」
- var firstDetail = order.Details.FirstOrDefault();
- if (firstDetail?.MedicineGoods != null && !string.IsNullOrEmpty(firstDetail.MedicineGoods.MaterielErpType))
+ 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
{
- //濡傛灉鏉′欢婊¤冻锛屽皢鐗╂枡浠ｇ爜璁剧疆涓虹涓�涓槑缁嗛」瀵瑰簲鐨勮嵂鍝佺墿鏂欎唬鐮�
- materialCode = firstDetail.MedicineGoods.MaterielErpType;
- }
- // 3. 缁勮 DTO
- var ediDto = new TowcsDto.ToediOutInfo
+ Reservoirarea = outorder.warehouse_no,
+ 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()
+ };
+ #endregion
+ #region 澶勭悊搴撳瓨銆佸簱瀛樻壒娆°�佹坊鍔犲嚭搴撲换鍔�
+ List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
+ List<Dt_Inventory_Batch> batchesUp = new List<Dt_Inventory_Batch>();
+ List<Dt_InventoryInfo> inventoryInfosUp = new List<Dt_InventoryInfo>();
+ var inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => entityOrder.Details.Select(e => e.Goods_no).Contains(x.MaterielCode));
+ var InventoryInfos = _inventoryInfoService.Repository.QueryData(x => entityOrder.Details.Select(e => e.Goods_no).Contains(x.MaterielCode) && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.AvailableQuantity > 0 && x.WarehouseCode == outorder.warehouse_no);
+ foreach (var item in entityOrder.Details)
+ {
+ Dt_Inventory_Batch? inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num).FirstOrDefault();
+ if (inventory_Batch == null) throw new Exception($"鏈壘鍒板嚭搴撳崟鍙枫�恵entityOrder.Out_no}銆戜腑鐗╂枡缂栧彿銆恵item.Goods_no}銆戠墿鏂欐壒娆°�恵item.Batch_num}銆戠殑搴撳瓨鎵规淇℃伅");
+ if (inventory_Batch.AvailableQuantity < item.Order_qty) throw new Exception($"鍑哄簱鍗曞彿銆恵entityOrder.Out_no}銆戜腑鐗╂枡缂栧彿銆恵item.Goods_no}銆戠墿鏂欐壒娆°�恵item.Batch_num}銆戠殑搴撳瓨鎵规淇℃伅鍙敤鏁伴噺涓嶈冻");
+ inventory_Batch.AvailableQuantity -= item.Order_qty;
+ inventory_Batch.OutboundQuantity += item.Order_qty;
+ List<Dt_InventoryInfo> dt_InventoryInfos = InventoryInfos.Where(x => x.MaterielCode == item.Goods_no && x.BatchNo == item.Batch_num).ToList();
+ if (dt_InventoryInfos.Count < 1) throw new Exception($"鍑哄簱鍗曞彿銆恵entityOrder.Out_no}銆戜腑鐗╂枡缂栧彿銆恵item.Goods_no}銆戠墿鏂欐壒娆°�恵item.Batch_num}銆戠殑鍙敤搴撳瓨涓嶈冻");
+ #region 鎸夊嚭搴撶瓥鐣ユ煡鎵惧簱瀛�
+ if (tactics.SelectTactice == TacticsEnum.ComeOutonFirstTime.ObjToInt())
+ dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.ValidityPeriod).ToList();
+ else
+ dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.InDate).ToList();
+ #endregion
+ var Order_qty = item.Order_qty;//鍑哄簱鍗曟暟閲�
+ foreach (var InventoryInfo in dt_InventoryInfos)
{
- customerCode = "905",
- materialCode = materialCode,
- externalOrderNo = order.Out_no,
- outOrderType = order.Out_type == "1" ? "10" : order.Out_type == "2" ? "20" : "30",
- priority = 1,
- Is_cancel = 0,
- details = order.Details.Select(d => new TowcsDto.ToeOutdiInDetail
+ if (Order_qty <= 0) break;
+ if (InventoryInfo.AvailableQuantity <= Order_qty)
{
- batchNo = d.Batch_num,
- productCode = d.Goods_no,
- productName = d.MedicineGoods?.MaterielName,
- productSpecifications = d.MedicineGoods?.MaterielModel,
- quantity = (int)d.Order_qty,
- //stocktakingDetails = order.Out_type == "3"
- // ? new List<ToOutediInStock>
- // {
- // new ToOutediInStock { palletCode = "FC00001", quantity = d.Order_qty.ToString() }
- // }
- // : null
- }).ToList()
- };
-
- // 4. 璋冪敤鎺ュ彛
- var 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);
-
- if (resp != null && resp.code == "0")
- {
- // 鏇存柊琛ㄥご鐘舵��
- BaseDal.Db.Updateable<Dt_DeliveryOrder>()
- .SetColumns(o => new Dt_DeliveryOrder { OutStatus = "寮�濮�" })
- .Where(o => o.Id == order.Id)
- .ExecuteCommand();
-
- // 鏇存柊鏄庣粏鐘舵��
- BaseDal.Db.Updateable<Dt_DeliveryOrderDetail>()
- .SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1, OotDetailStatus = "宸插畬鎴�" })
- .Where(d => d.DeliveryOrderId == order.Id && d.Status == 0)
- .ExecuteCommand();
- Console.WriteLine($"璁㈠崟 {order.Out_no} 鎺ㄩ�佹垚鍔�");
+ Order_qty -= InventoryInfo.AvailableQuantity;
+ InventoryInfo.OutboundQuantity += InventoryInfo.AvailableQuantity;
+ Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ {
+ WarehouseCode = InventoryInfo.WarehouseCode,
+ BatchNo = InventoryInfo.BatchNo,
+ MaterielName = InventoryInfo.MaterielName,
+ MaterielCode = InventoryInfo.MaterielCode,
+ MaterielSpec = InventoryInfo.MaterielSpec,
+ TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
+ TaskType = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName ?? "System",
+ LocationCode = InventoryInfo.LocationCode,
+ OrderNo = entityOrder.Out_no,
+ StockQuantity = InventoryInfo.AvailableQuantity,
+ SupplyQuantity = 0,
+ Remark = "鍑哄簱"
+ };
+ supplyTasks.Add(supplyTask);
+ InventoryInfo.AvailableQuantity = 0;
+ }
+ else
+ {
+ InventoryInfo.AvailableQuantity -= Order_qty;
+ InventoryInfo.OutboundQuantity += Order_qty;
+ Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ {
+ WarehouseCode = InventoryInfo.WarehouseCode,
+ BatchNo = InventoryInfo.BatchNo,
+ MaterielName = InventoryInfo.MaterielName,
+ MaterielCode = InventoryInfo.MaterielCode,
+ MaterielSpec = InventoryInfo.MaterielSpec,
+ TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
+ TaskType = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName ?? "System",
+ LocationCode = InventoryInfo.LocationCode,
+ OrderNo = entityOrder.Out_no,
+ StockQuantity = Order_qty,
+ SupplyQuantity = 0,
+ Remark = "鍑哄簱"
+ };
+ supplyTasks.Add(supplyTask);
+ Order_qty = 0;
+ }
+ inventoryInfosUp.Add(InventoryInfo);
}
+ batchesUp.Add(inventory_Batch);
+ }
+ _unitOfWorkManage.BeginTran();
+ _supplyTaskService.AddData(supplyTasks);
+ _inventory_BatchServices.UpdateData(batchesUp);
+ _inventoryInfoService.UpdateData(inventoryInfosUp);
+ BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
+ #endregion
+ }
+ #endregion
+ else
+ {
+ string WareCodeDJ = WarehouseEnum.澶т欢搴�.ObjToInt().ToString("000");
+ string WareCodeLK = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000");
+ #region 鍒涘缓澶т欢搴撱�佺珛搴撳嚭搴撳ご琛�
+ var entityOrder = new Dt_DeliveryOrder
+ {
+ Out_no = outorder.order_no,
+ Out_type = outorder.order_type,
+ OutStatus = "鏂板缓",
+ Client_name = outorder.client_name,
+ Account_time = outorder.account_time,
+ Client_no = outorder.client_no,
+ Warehouse_no = WareCodeDJ,
+ Details = new List<Dt_DeliveryOrderDetail>()
+ };
+ var entityOrderLK = new Dt_DeliveryOrder
+ {
+ Out_no = outorder.order_no,
+ Out_type = outorder.order_type,
+ OutStatus = "鏂板缓",
+ Client_name = outorder.client_name,
+ Account_time = outorder.account_time,
+ Client_no = outorder.client_no,
+ Warehouse_no = WareCodeLK,
+ Details = new List<Dt_DeliveryOrderDetail>()
+ };
+ #endregion
+ #region 鏌ユ壘搴撳瓨
+ List<Dt_Inventory_Batch> batchesUp = new List<Dt_Inventory_Batch>();
+ List<Dt_InventoryInfo> inventoryInfosUp = new List<Dt_InventoryInfo>();
+ List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
+ List<Dt_MaterielInfo> materielInfos = _materielInfoService.Repository.QueryData(x => outorder.details.Select(e => e.goods_no).Contains(x.MaterielCode));
+ var inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => outorder.details.Select(e => e.goods_no).Contains(x.MaterielCode));
+ var InventoryInfos = _inventoryInfoService.Repository.QueryData(x => outorder.details.Select(e => e.goods_no).Contains(x.MaterielCode) && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.AvailableQuantity > 0 && (x.WarehouseCode == WareCodeDJ || x.WarehouseCode == WareCodeLK));
+ foreach (var detail in outorder.details)
+ {
+ #region 鏌ヨ搴撳瓨鎵规鍜屽簱瀛�
+ Dt_Inventory_Batch? inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == detail.goods_no && x.BatchNo == detail.batch_num).FirstOrDefault();
+ if (inventory_Batch == null) throw new Exception($"鏈壘鍒板嚭搴撳崟鍙枫�恵outorder.order_no}銆戜腑鐗╂枡缂栧彿銆恵detail.goods_no}銆戠墿鏂欐壒娆°�恵detail.batch_num}銆戠殑搴撳瓨鎵规淇℃伅");
+ if (inventory_Batch.AvailableQuantity < detail.order_qty) throw new Exception($"鍑哄簱鍗曞彿銆恵outorder.order_no}銆戜腑鐗╂枡缂栧彿銆恵detail.goods_no}銆戠墿鏂欐壒娆°�恵detail.batch_num}銆戠殑搴撳瓨鎵规淇℃伅鍙敤鏁伴噺涓嶈冻");
+ inventory_Batch.AvailableQuantity -= detail.order_qty;
+ inventory_Batch.OutboundQuantity += detail.order_qty;
+ List<Dt_InventoryInfo> dt_InventoryInfos = InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList();
+ if (dt_InventoryInfos.Count < 1) throw new Exception($"鍑哄簱鍗曞彿銆恵outorder.order_no}銆戜腑鐗╂枡缂栧彿銆恵detail.goods_no}銆戠墿鏂欐壒娆°�恵detail.batch_num}銆戠殑鍙敤搴撳瓨涓嶈冻");
+ #endregion
+ #region 鎸夊嚭搴撶瓥鐣ユ煡鎵惧簱瀛�
+ if (tactics.SelectTactice == TacticsEnum.ComeOutonFirstTime.ObjToInt())
+ dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.ValidityPeriod).ToList();
+ else
+ dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.InDate).ToList();
+ #endregion
+ var Order_qty = Math.Abs(detail.order_qty);//鍑哄簱鍗曟暟閲�
+ #region 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅
+ Dt_MaterielInfo? materielInfo = materielInfos.Where(x => x.MaterielCode == detail.goods_no).FirstOrDefault();
+ if (materielInfo == null) throw new Exception($"鏈壘鍒拌嵂鍝佺紪鐮併�恵detail.goods_no}銆戠殑淇℃伅");
+ if (!Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
+ throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵detail.goods_no}銆戠殑灞炴�у垎绫�");
+ #endregion
+ #region 澶т欢
+ if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)//濡傛灉鐗╂枡鏄ぇ浠�
+ {
+ #region 娣诲姞鍑哄簱璇︽儏
+ Dt_DeliveryOrderDetail orderDetail = new Dt_DeliveryOrderDetail()
+ {
+ Reservoirarea = entityOrder.Warehouse_no,
+ Goods_no = detail.goods_no,
+ Order_qty = detail.order_qty,
+ Batch_num = detail.batch_num,
+ Exp_date = detail.exp_date,
+ OotDetailStatus = "鏂板缓",
+ Order_Outqty = 0,
+ Status = 2
+ };
+ entityOrder.Details.Add(orderDetail);
+ #endregion
+
+ #region 璁＄畻搴撳瓨銆佹坊鍔犲嚭搴撲换鍔�
+ foreach (var InventoryInfo in dt_InventoryInfos)
+ {
+ if (Order_qty <= 0) break;
+ if (InventoryInfo.AvailableQuantity < Order_qty)
+ {
+ Order_qty -= InventoryInfo.AvailableQuantity;
+ InventoryInfo.OutboundQuantity += InventoryInfo.AvailableQuantity;
+ Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ {
+ WarehouseCode = InventoryInfo.WarehouseCode,
+ BatchNo = InventoryInfo.BatchNo,
+ MaterielName = InventoryInfo.MaterielName,
+ MaterielCode = InventoryInfo.MaterielCode,
+ MaterielSpec = InventoryInfo.MaterielSpec,
+ TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
+ TaskType = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName ?? "System",
+ LocationCode = InventoryInfo.LocationCode,
+ OrderNo = entityOrder.Out_no,
+ StockQuantity = InventoryInfo.AvailableQuantity,
+ SupplyQuantity = 0,
+ Remark = "鍑哄簱"
+ };
+ supplyTasks.Add(supplyTask);
+ InventoryInfo.AvailableQuantity = 0;
+ }
+ else
+ {
+ InventoryInfo.AvailableQuantity -= Order_qty;
+ InventoryInfo.OutboundQuantity += Order_qty;
+ Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ {
+ WarehouseCode = InventoryInfo.WarehouseCode,
+ BatchNo = InventoryInfo.BatchNo,
+ MaterielName = InventoryInfo.MaterielName,
+ MaterielCode = InventoryInfo.MaterielCode,
+ MaterielSpec = InventoryInfo.MaterielSpec,
+ TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
+ TaskType = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName ?? "System",
+ LocationCode = InventoryInfo.LocationCode,
+ OrderNo = entityOrder.Out_no,
+ StockQuantity = Order_qty,
+ SupplyQuantity = 0,
+ Remark = "鍑哄簱"
+ };
+ supplyTasks.Add(supplyTask);
+ Order_qty = 0;
+ }
+ }
+ #endregion
+ inventoryInfosUp.AddRange(dt_InventoryInfos);
+ batchesUp.Add(inventory_Batch);
+ //_inventory_BatchServices.Repository.UpdateData(inventory_Batch);
+ //_inventoryInfoService.Repository.UpdateData(dt_InventoryInfos);
+ //_supplyTaskService.AddData(supplyTasks);
+ }
+ #endregion
else
{
- SendErrorToUpstream(3, order.Out_no, resp?.msg ?? "WCS 鎺ㄩ�佸け璐�", "");
- Console.WriteLine($"璁㈠崟 {order.Out_no} 鎺ㄩ�佸け璐ワ細{resp?.msg}");
+ if (materielInfo.BoxQty < 1) throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵detail.goods_no}銆戠殑绠辫鏁伴噺");
+ Dt_DeliveryOrderDetail orderDetail = null;
+ Dt_DeliveryOrderDetail orderDetailLK = null;
+ var ys = Order_qty % materielInfo.BoxQty; //涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
+ var xs = (int)(Order_qty / materielInfo.BoxQty);//淇濈暀鏁存暟
+ #region 鏁ｄ欢浼樺厛鍒嗛厤绔嬪簱
+ if (ys > 0)
+ {
+ orderDetailLK = new Dt_DeliveryOrderDetail()
+ {
+ Reservoirarea = entityOrderLK.Warehouse_no,
+ Goods_no = detail.goods_no,
+ Order_qty = ys,
+ Batch_num = detail.batch_num,
+ Exp_date = detail.exp_date,
+ OotDetailStatus = "鏂板缓",
+ Order_Outqty = 0,
+ Status = 0
+ };
+ }
+ #endregion
+
+ #region 鏁翠欢浼樺厛鍒嗛厤澶т欢搴�,璁″垝搴撳瓨,娣诲姞鍑哄簱浠诲姟
+ foreach (var item in dt_InventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ))
+ {
+ if (xs <= 0 || item.AvailableQuantity <= 0) break;
+ decimal outqty = 0;
+ while (item.AvailableQuantity > 0 && xs > 0)
+ {
+ xs--;
+ if (orderDetail == null)
+ {
+ orderDetail = new Dt_DeliveryOrderDetail()
+ {
+ Reservoirarea = entityOrder.Warehouse_no,
+ Goods_no = detail.goods_no,
+ Order_qty = materielInfo.BoxQty,
+ Batch_num = detail.batch_num,
+ Exp_date = detail.exp_date,
+ OotDetailStatus = "鏂板缓",
+ Order_Outqty = 0,
+ Status = 2
+ };
+ item.AvailableQuantity -= materielInfo.BoxQty;
+ item.OutboundQuantity += materielInfo.BoxQty;
+ outqty += materielInfo.BoxQty;
+ }
+ else
+ {
+ orderDetail.Order_qty += materielInfo.BoxQty;
+ item.AvailableQuantity -= materielInfo.BoxQty;
+ item.OutboundQuantity += materielInfo.BoxQty;
+ outqty += materielInfo.BoxQty;
+ }
+ }
+ Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ {
+ WarehouseCode = item.WarehouseCode,
+ BatchNo = item.BatchNo,
+ MaterielName = item.MaterielName,
+ MaterielCode = item.MaterielCode,
+ MaterielSpec = item.MaterielSpec,
+ TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
+ TaskType = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName ?? "System",
+ LocationCode = item.LocationCode,
+ OrderNo = entityOrder.Out_no,
+ StockQuantity = outqty,
+ SupplyQuantity = 0,
+ Remark = "鍑哄簱"
+ };
+ supplyTasks.Add(supplyTask);
+ inventoryInfosUp.Add(item);
+ //_inventoryInfoService.Repository.UpdateData(item);
+ }
+ #endregion
+
+ #region 鍒嗛厤瀹屽ぇ浠跺簱濡傛灉杩樻湁绠辨暟锛屽啀閫夋嫨鍒嗛厤绔嬪簱
+ if (xs > 0)
+ {
+ if (orderDetailLK == null)
+ {
+ orderDetailLK = new Dt_DeliveryOrderDetail()
+ {
+ Reservoirarea = entityOrderLK.Warehouse_no,
+ Goods_no = detail.goods_no,
+ Order_qty = xs * materielInfo.BoxQty,
+ Batch_num = detail.batch_num,
+ Exp_date = detail.exp_date,
+ OotDetailStatus = "鏂板缓",
+ Order_Outqty = 0,
+ Status = 0
+ };
+ }
+ else
+ {
+ orderDetailLK.Order_qty += xs * materielInfo.BoxQty;
+ }
+ }
+ #endregion
+
+ #region 绔嬪簱鍑哄簱鍗曪紝淇敼绔嬪簱搴撳瓨锛屾坊鍔犵珛搴撳嚭搴撲换鍔�
+ if (orderDetailLK != null)
+ {
+ #region 娣诲姞鍑哄簱浠诲姟銆佷慨鏀瑰簱瀛樹俊鎭�
+ Dt_InventoryInfo? inventoryInfo = dt_InventoryInfos.FirstOrDefault(x => x.WarehouseCode == WareCodeLK);
+ if (inventoryInfo == null)
+ throw new Exception($"鍑哄簱鍗曘�恵outorder.order_no}銆戣鎯呭瓨鍦ㄦ暎浠�,鐗╂枡缂栧彿銆恵detail.goods_no}銆戠墿鏂欐壒娆°�恵detail.batch_num}銆戞墍闇�鏁伴噺銆恵Convert.ToInt32(orderDetailLK.Order_qty)}銆戣浜哄伐璋冩嫧琛ヨ揣鍏ョ珛搴�");
+ inventoryInfo.AvailableQuantity -= orderDetailLK.Order_qty;
+ inventoryInfo.OutboundQuantity += orderDetailLK.Order_qty;
+ Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ {
+ WarehouseCode = inventoryInfo.WarehouseCode,
+ BatchNo = inventoryInfo.BatchNo,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ TaskStatus = SupplyStatusEnum.NewOut.ObjToInt(),
+ TaskType = outorder.order_type == "1" ? TaskTypeEnum.Out.ObjToInt() : TaskTypeEnum.InReturn.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName ?? "System",
+ LocationCode = inventoryInfo.LocationCode,
+ OrderNo = entityOrder.Out_no,
+ StockQuantity = orderDetailLK.Order_qty,
+ SupplyQuantity = 0,
+ Remark = "鍑哄簱"
+ };
+ supplyTasks.Add(supplyTask);
+ #endregion
+ //_inventoryInfoService.Repository.UpdateData(inventoryInfo);
+ inventoryInfosUp.Add(inventoryInfo);
+ entityOrderLK.Details.Add(orderDetailLK);
+ }
+ #endregion
+ if (orderDetail != null) entityOrder.Details.Add(orderDetail);
+ batchesUp.Add(inventory_Batch);
+ //_inventory_BatchServices.Repository.UpdateData(inventory_Batch);
+ //_supplyTaskService.AddData(supplyTasks);
}
- //鍒犻櫎鍏ㄩ儴鐘朵负宸插畬鎴愮殑鏄庣粏鍜岃〃澶达紝绉诲叆鍘嗗彶琛�
+ }
+ try
+ {
+ _unitOfWorkManage.BeginTran();
+ _supplyTaskService.AddData(supplyTasks);
+ _inventory_BatchServices.UpdateData(batchesUp);
+ _inventoryInfoService.UpdateData(inventoryInfosUp);
+ if (entityOrder.Details.Count > 0)
+ BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
+ if (entityOrderLK.Details.Count > 0)
+ BaseDal.Db.InsertNav(entityOrderLK).Include(x => x.Details).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
}
catch (Exception ex)
{
- SendErrorToUpstream(3, order.Out_no, ex.Message, "");
- Console.WriteLine($"璁㈠崟 {order.Out_no} 鎺ㄩ�佸紓甯革細{ex.Message}");
+ _unitOfWorkManage.RollbackTran();
}
+ #endregion
}
-
- return responseContent.OK("鍑哄簱璁㈠崟鎺ㄩ�佸畬鎴�");
+ webResponseContent.OK();
}
catch (Exception ex)
{
- Console.WriteLine("EdiOut 寮傚父锛�" + ex.Message);
- return responseContent.Error("鍑哄簱璁㈠崟鎺ㄩ�佸け璐ワ細" + ex.Message);
+ _messageInfoService.AddMessageInfo(MessageGroupByEnum.OutOrderAlarm, (outorder.order_type == "3" ? "鍏ュ簱閫�璐�" : "姝ｅ父鍑哄簱") + $"锛氬崟鍙枫�恵outorder.order_no}銆�", ex.Message);
+ webResponseContent.Error(ex.Message);
}
+ return webResponseContent;
}
+ #endregion
+
+ #region 鍒涘缓鐩樹簭鍑哄簱鍗�
+ public WebResponseContent CreateCheckOutOrder(UpstramOutOrderInfo order)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ string WareCodeMJ = WarehouseEnum.楹荤簿搴�.ObjToInt().ToString("000");
+ string WareCodeLD = WarehouseEnum.鍐峰喕搴�.ObjToInt().ToString("000");
+ List<Dt_SupplyTask_Hty> supplyTask_Hties = new List<Dt_SupplyTask_Hty>();
+ List<Dt_Inventory_Batch> batchesUp = new List<Dt_Inventory_Batch>();
+ List<Dt_InventoryInfo> infosUp = new List<Dt_InventoryInfo>();
+ var codes = order.details.Select(x => x.goods_no).ToList();
+ #region 鐗规畩搴撴埧
+ if (order.warehouse_no == WareCodeMJ || order.warehouse_no == WareCodeLD)
+ {
+ List<Dt_Inventory_Batch> inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => codes.Contains(x.MaterielCode));
+ List<Dt_InventoryInfo> _InventoryInfos = _inventoryInfoService.Repository.QueryData(x => codes.Contains(x.MaterielCode));
+ #region 搴撳瓨銆佸簱瀛樻壒娆″钩璐�
+ foreach (var item in order.details)
+ {
+ //鎵惧簱瀛樻壒娆′俊鎭�
+ Dt_Inventory_Batch inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num).First();
+ var Qty = Math.Abs(inventory_Batch.SupplyQuantity);
+ if (Qty != item.order_qty) throw new Exception($"鐩樹簭鍑哄簱鍗曘�恵order.order_no}銆戠墿鏂欑紪鍙枫�恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戠殑鐩樹簭鏁伴噺鏈夎");
+ //鎵炬墍鏈夊簱瀛�
+ List<Dt_InventoryInfo> inventoryInfos = _InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList();
+ foreach (var inventoryInfo in inventoryInfos)
+ {
+ #region 娣诲姞鐩樹簭鍑哄簱浠诲姟
+ if (inventoryInfo.StockQuantity != inventoryInfo.SupplyQuantity)
+ {
+ Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
+ {
+ WarehouseCode = inventoryInfo.WarehouseCode,
+ OperateType = OperateTypeEnum.鑷姩瀹屾垚.ToString(),
+ InsertTime = DateTime.Now,
+ TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt(),
+ BatchNo = inventoryInfo.BatchNo,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ TaskType = TaskTypeEnum.ChenckOut.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ LocationCode = inventoryInfo.LocationCode,
+ OrderNo = order.order_no,
+ StockQuantity = Math.Abs(inventoryInfo.SupplyQuantity),
+ SupplyQuantity = 0,
+ Remark = "鐩樹簭鍏ュ簱"
+ };
+ //_supplyTaskHtyService.AddData(supplyTask_Hty);
+ supplyTask_Hties.Add(supplyTask_Hty);
+ }
+ #endregion
+ inventoryInfo.StockQuantity += inventoryInfo.SupplyQuantity;
+ inventoryInfo.AvailableQuantity = inventoryInfo.StockQuantity;
+ inventoryInfo.SupplyQuantity = 0;
+ inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ inventory_Batch.StockQuantity += inventory_Batch.SupplyQuantity;
+ inventory_Batch.AvailableQuantity = inventory_Batch.StockQuantity;
+ inventory_Batch.SupplyQuantity = 0;
+ infosUp.AddRange(inventoryInfos);
+ batchesUp.Add(inventory_Batch);
+ //_inventoryInfoService.UpdateData(inventoryInfos);
+ //_inventory_BatchServices.UpdateData(inventory_Batch);
+ }
+ #endregion
+
+ #region 鍒涘缓鐩樼偣鍗�
+ var entityOrder = new Dt_DeliveryOrder
+ {
+ Out_no = order.order_no,
+ Out_type = order.order_type,
+ Client_no = order.client_no,
+ Client_name = order.client_name,
+ OutStatus = "宸插畬鎴�",
+ Account_time = order.account_time,
+ Warehouse_no = order.warehouse_no,
+ Details = order.details.Select(d => new Dt_DeliveryOrderDetail
+ {
+ Goods_no = d.goods_no,
+ Order_qty = Math.Abs(d.order_qty),
+ Order_Outqty = Math.Abs(d.order_qty),
+ Batch_num = d.batch_num,
+ Exp_date = d.exp_date,
+ Reservoirarea = order.warehouse_no,
+ OotDetailStatus = "宸插畬鎴�",
+ Status = 2,
+ }).ToList()
+ };
+ _unitOfWorkManage.BeginTran();
+ _supplyTaskHtyService.AddData(supplyTask_Hties);
+ _inventoryInfoService.UpdateData(infosUp);
+ _inventory_BatchServices.UpdateData(batchesUp);
+ BaseDal.Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
+ #endregion
+ }
+ #endregion
+ else
+ {
+ List<Dt_DeliveryOrder> deliveryOrdersAdd = new List<Dt_DeliveryOrder>();
+ string WareCodeLK = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000");
+ string WareCodeDJ = WarehouseEnum.澶т欢搴�.ObjToInt().ToString("000");
+ List<Dt_Inventory_Batch> inventory_Batchs = _inventory_BatchServices.Repository.QueryData(x => codes.Contains(x.MaterielCode));
+ List<Dt_InventoryInfo> _InventoryInfos = _inventoryInfoService.Repository.QueryData(x => codes.Contains(x.MaterielCode));
+ foreach (var item in order.details)
+ {
+ //鎵惧簱瀛樻壒娆′俊鎭�
+ Dt_Inventory_Batch inventory_Batch = inventory_Batchs.Where(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num).First();
+ var Qty = Math.Abs(inventory_Batch.SupplyQuantity);
+ if (Qty != item.order_qty) throw new Exception($"鐩樹簭鍑哄簱鍗曘�恵order.order_no}銆戠墿鏂欑紪鍙枫�恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戠殑鐩樹簭鏁伴噺鏈夎");
+ //鎵炬墍鏈夊簱瀛�
+ List<Dt_InventoryInfo> inventoryInfos = _InventoryInfos.Where(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo).ToList();
+ //鑾峰彇绔嬪簱鐩樼偣宸紓鏁�.銆傘�傘�傘�傘�傘�傘�傘�傘�傘�傘�傘��
+ var inventoryLK = inventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First();
+ //var LkQty = Math.Abs(inventoryLK.SupplyQuantity);
+ var LkQty = inventoryLK.SupplyQuantity;
+ //鑾峰彇澶т欢搴撶洏鐐瑰樊寮傛暟
+ var inventoryDJ = inventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ).ToList();
+ //var DJQty = Math.Abs(inventoryDJ.Sum(x => x.SupplyQuantity));
+ var DJQty = inventoryDJ.Sum(x => x.SupplyQuantity);
+ var count = Math.Abs(LkQty + DJQty);
+ if (count != Qty) throw new Exception($"銆恵order.order_no}銆戠墿鏂欑紪鍙枫�恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戠殑鐗╂枡淇℃伅涓庣墿鏂欐壒娆′俊鎭洏浜忔暟閲忎笉绗�");
+ if (LkQty == 0)//绔嬪簱鏃犲樊寮�
+ {
+ #region 搴撳瓨銆佸簱瀛樻壒娆″钩璐�
+ foreach (var inventoryInfo in inventoryInfos)
+ {
+ #region 娣诲姞鐩樹簭鍑哄簱浠诲姟
+ if (inventoryInfo.StockQuantity != inventoryInfo.SupplyQuantity)
+ {
+ Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
+ {
+ WarehouseCode = inventoryInfo.WarehouseCode,
+ OperateType = OperateTypeEnum.鑷姩瀹屾垚.ToString(),
+ InsertTime = DateTime.Now,
+ TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt(),
+ BatchNo = inventoryInfo.BatchNo,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ TaskType = TaskTypeEnum.ChenckOut.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ LocationCode = inventoryInfo.LocationCode,
+ OrderNo = order.order_no,
+ StockQuantity = Math.Abs(inventoryInfo.SupplyQuantity),
+ SupplyQuantity = 0,
+ Remark = "鐩樹簭鍏ュ簱"
+ };
+ //_supplyTaskHtyService.AddData(supplyTask_Hty);
+ supplyTask_Hties.Add(supplyTask_Hty);
+ }
+ #endregion
+ inventoryInfo.StockQuantity += inventoryInfo.SupplyQuantity;
+ inventoryInfo.AvailableQuantity = inventoryInfo.StockQuantity;
+ inventoryInfo.SupplyQuantity = 0;
+ inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ //_inventoryInfoService.UpdateData(inventoryInfos);
+ inventory_Batch.StockQuantity += inventory_Batch.SupplyQuantity;
+ inventory_Batch.AvailableQuantity = inventory_Batch.StockQuantity;
+ inventory_Batch.SupplyQuantity = 0;
+ //_inventory_BatchServices.UpdateData(inventory_Batch);
+ infosUp.AddRange(inventoryInfos);
+ batchesUp.Add(inventory_Batch);
+ #endregion
+
+ #region 鍒涘缓澶т欢搴撶洏鐐瑰崟
+ var entityOrder = new Dt_DeliveryOrder
+ {
+ Out_no = order.order_no,
+ Out_type = order.order_type,
+ Client_no = order.client_no,
+ Account_time = order.account_time,
+ OutStatus = "宸插畬鎴�",
+ Client_name = order.client_name,
+ Warehouse_no = WareCodeDJ,
+ Details = order.details.Select(d => new Dt_DeliveryOrderDetail
+ {
+ Goods_no = d.goods_no,
+ Order_qty = Math.Abs(d.order_qty),
+ Order_Outqty = Math.Abs(d.order_qty),
+ Batch_num = d.batch_num,
+ Exp_date = d.exp_date,
+ Reservoirarea = WareCodeDJ,
+ OotDetailStatus = "宸插畬鎴�",
+ Status = 2,
+ }).ToList()
+ };
+ //Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+ //Repository.AddData(entityOrder);
+ deliveryOrdersAdd.Add(entityOrder);
+ #endregion
+ }
+ else
+ {
+ #region 澶т欢搴撳簱瀛樺钩璐�
+ inventoryInfos = inventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ).ToList();
+ foreach (var inventoryInfo in inventoryInfos)
+ {
+ #region 娣诲姞鐩樹簭鍑哄簱浠诲姟
+ if (inventoryInfo.StockQuantity != inventoryInfo.SupplyQuantity)
+ {
+ Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
+ {
+ WarehouseCode = inventoryInfo.WarehouseCode,
+ OperateType = OperateTypeEnum.鑷姩瀹屾垚.ToString(),
+ InsertTime = DateTime.Now,
+ TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt(),
+ BatchNo = inventoryInfo.BatchNo,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ TaskType = TaskTypeEnum.ChenckOut.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ LocationCode = inventoryInfo.LocationCode,
+ OrderNo = order.order_no,
+ StockQuantity = Math.Abs(inventoryInfo.SupplyQuantity),
+ SupplyQuantity = 0,
+ Remark = "鐩樹簭鍑哄簱"
+ };
+ //_supplyTaskHtyService.AddData(supplyTask_Hty);
+ supplyTask_Hties.Add(supplyTask_Hty);
+ }
+ #endregion
+ inventoryInfo.StockQuantity += inventoryInfo.SupplyQuantity;
+ inventoryInfo.AvailableQuantity = inventoryInfo.StockQuantity;
+ inventoryInfo.SupplyQuantity = 0;
+ inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ //_inventoryInfoService.UpdateData(inventoryInfos);
+ infosUp.AddRange(inventoryInfos);
+ #endregion
+
+ #region 鍒涘缓澶т欢搴撶洏鐐瑰崟
+ if (DJQty != 0)
+ {
+ var cabinOrder = new Dt_DeliveryOrder
+ {
+ Out_no = order.order_no,
+ Out_type = order.order_type,
+ Client_name = order.client_name,
+ Account_time = order.account_time,
+ OutStatus = "宸插畬鎴�",
+ Client_no = order.client_no,
+ Warehouse_no = WareCodeDJ,
+ Details = order.details.Select(d => new Dt_DeliveryOrderDetail
+ {
+ Goods_no = d.goods_no,
+ Order_qty = DJQty,
+ Order_Outqty = DJQty,
+ Batch_num = d.batch_num,
+ Exp_date = d.exp_date,
+ Reservoirarea = WareCodeDJ,
+ OotDetailStatus = "宸插畬鎴�",
+ Status = 2,
+ }).ToList()
+ };
+ //Repository.AddData(cabinOrder);
+ //Db.InsertNav(cabinOrder).Include(it => it.Details).ExecuteCommand();
+ deliveryOrdersAdd.Add(cabinOrder);
+ }
+ #endregion
+ //杩欓噷
+ #region 鍒涘缓绔嬪簱鐩樼偣鍗�
+ var entityOrder = new Dt_DeliveryOrder
+ {
+ Out_no = order.order_no,
+ Out_type = order.order_type,
+ Client_no = order.client_no,
+ Account_time = order.account_time,
+ OutStatus = "鏂板缓",
+ Client_name = order.client_name,
+ Warehouse_no = WareCodeLK,
+ Details = order.details.Select(d => new Dt_DeliveryOrderDetail
+ {
+ Goods_no = d.goods_no,
+ Order_qty = Math.Abs(LkQty), //缁欎笅娓竁CS鐨勬槸瑕佹暣鏁�
+ Batch_num = d.batch_num,
+ Exp_date = d.exp_date,
+ Reservoirarea = WareCodeLK,
+ OotDetailStatus = "鏂板缓",
+ Status = 0,
+ }).ToList()
+ };
+ //Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+ //Repository.AddData(entityOrder);
+ deliveryOrdersAdd.Add(entityOrder);
+ #endregion
+ }
+ //return WebResponseContent.Instance.OK("鎴愬姛");
+ }
+ _unitOfWorkManage.BeginTran();
+ _supplyTaskHtyService.AddData(supplyTask_Hties);
+ _inventoryInfoService.UpdateData(infosUp);
+ _inventory_BatchServices.UpdateData(batchesUp);
+ BaseDal.Db.InsertNav(deliveryOrdersAdd).Include(it => it.Details).ExecuteCommand();
+ _unitOfWorkManage.CommitTran();
+ }
+ return WebResponseContent.Instance.OK("鎴愬姛");
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+ #endregion
//鐩樼偣 鎷挎暣涓壒娆′俊鎭〃鐨勫晢鍝佹壒鍙峰拰鍟嗗搧缂栧彿鏉ヨ繘琛岀洏鐐�
@@ -632,9 +954,7 @@
try
{
// 1锔忊儯 鏌ユ壘鎸囧畾鎵规涓庣墿鏂欑殑搴撳瓨淇℃伅
- var batchInfo = BaseDal.Db.Queryable<Dt_Inventory_Batch>()
- .Where(x => x.BatchNo == batchNo && x.MaterielCode == goodsNo)
- .First();
+ var batchInfo = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == batchNo && x.MaterielCode == goodsNo);
if (batchInfo == null)
return response.Error($"鏈壘鍒拌鐗╂枡 [{goodsNo}] 鎵规 [{batchNo}] 鐨勫簱瀛樹俊鎭�");
@@ -690,176 +1010,11 @@
}
-
-
/// <summary>
- /// 鍑哄簱鎶ュ畬鎴愭帴鍙�
+ /// 鏌ヨ鍑哄簱鍗曞垪琛�
/// </summary>
- /// <param name="out_no">鍑哄簱鍗曞彿</param>
+ /// <param name="saveModel"></param>
/// <returns></returns>
- 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;
-
- 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
- };
- var result = HttpHelper.Post(url, requestDate.ToJsonString());
- var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
-
- 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} 鍗曘��");
- }
- catch (Exception ex)
- {
- return responseContent.Error("鎵归噺澶勭悊澶辫触锛�" + ex.Message);
- }
- }
-
-
-
-
- /// <summary>
- /// 鎺ㄩ�佸紓甯镐俊鎭粰涓婃父绯荤粺 1.鍏ュ簱鍗曟帴鍙ｏ紱2.鍏ュ簱鍗曟姤瀹屾垚鎺ュ彛锛�3.鍑哄簱鍗曟帴鍙ｏ紱4.鍑哄簱鎶ュ畬鎴愭帴鍙ｏ紱5.鑽搧鍩虹淇℃伅鍚屾鎺ュ彛锛�6.渚涘簲鍟嗕俊鎭帴鍙ｏ紱7.瀹㈡埛淇℃伅鎺ュ彛锛�8.搴撳瓨鏌ヨ鎺ュ彛
- /// </summary>
- public void SendErrorToUpstream(int type, string code, string message, string remark)
- {
- try
- {
- var url = "http://121.37.118.63:80/GYZ2/95fck/exceptionLog";
-
- var requestData = new
- {
- type = type.ToString(),
- code = code,
- message = message,
- remark = remark
- };
-
- var result = HttpHelper.Post(url, requestData.ToJsonString());
- // 鍙互鍙嶅簭鍒楀寲妫�鏌� resultCode 鏄惁涓�0
- }
- catch (Exception e)
- {
- // 杩欓噷涓嶈鍐嶆姏寮傚父浜嗭紝閬垮厤姝诲惊鐜�
- Console.WriteLine("寮傚父鎺ュ彛鎺ㄩ�佸け璐ワ細" + e.Message);
- }
- }
-
-
public WebResponseContent GetDeliveryOrders(SaveModel saveModel)
{
WebResponseContent content = new WebResponseContent();
@@ -871,11 +1026,11 @@
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);
+ dt_ReceiveOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => (x.OutStatus == "鏂板缓" || x.OutStatus == "寮�濮�") && x.Warehouse_no == warehouseCode && x.Out_type != "20").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);
+ 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 != "20" && x.Warehouse_no == warehouseCode).OrderByDescending(x => x.CreateDate).Includes(x => x.Details).ToPageList(pageNo, 5);
}
content.OK(data: dt_ReceiveOrders);
@@ -900,14 +1055,21 @@
WebResponseContent content = new WebResponseContent();
Dt_DeliveryOrder cabinOrder = new Dt_DeliveryOrder();
if (isPick)
- cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Includes(x => x.Details).First(x => x.Out_no == orderNo && x.Out_type == "3");
+ cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Includes(x => x.Details).First(x => x.Out_no == orderNo && x.Out_type == "20");
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);
+ cabinOrder = Db.Queryable<Dt_DeliveryOrder>().Includes(x => x.Details).First(x => x.Out_no == orderNo && x.Out_type != "20");
+ //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;
}
+
+ /// <summary>
+ /// pad鍑哄簱瀹屾垚
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
public WebResponseContent OutFinish(SaveModel saveModel)
{
WebResponseContent content = new WebResponseContent();
@@ -918,79 +1080,87 @@
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 deliveryOrder = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == supplyTask.OrderNo && x.Warehouse_no == supplyTask.WarehouseCode).Includes(x => x.Details).First();
+ if (deliveryOrder == null) return WebResponseContent.Instance.OK($"鍑哄簱鍗曞凡瀹屾垚");
+ content = OutTaskFinish(supplyTask, deliveryOrder);
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
- 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}銆戠殑鐗╂枡淇℃伅");
+ public WebResponseContent OutTaskFinish(Dt_SupplyTask supplyTask, Dt_DeliveryOrder deliveryOrder)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_DeliveryOrderDetail? cabinOrderDetail = deliveryOrder.Details.FirstOrDefault(x => x.Batch_num == supplyTask.BatchNo && x.Goods_no == supplyTask.MaterielCode);
+ if (cabinOrderDetail == null) throw new Exception($"鍑哄簱鍗曟槑缁嗘湭鎵惧埌");
+ Dt_MaterielInfo materielInfo = _materielInfoService.Repository.QueryFirst(x => x.MaterielCode == supplyTask.MaterielCode);
+ if (materielInfo == null) throw new Exception($"璇风淮鎶ょ墿鏂欑紪鍙枫�恵supplyTask.MaterielCode}銆戠殑鐗╂枡淇℃伅");
cabinOrderDetail.Order_Outqty += supplyTask.StockQuantity;
- if (cabinOrderDetail.Order_Outqty > cabinOrderDetail.Order_qty)
- return WebResponseContent.Instance.Error($"鍑哄簱鏁伴噺涓嶅彲瓒呭嚭鍗曟嵁鏁伴噺");
-
-
- #region 澶勭悊鍑哄簱鍗曪紝璐т綅锛屽簱瀛橈紝搴撳瓨鎵规淇℃伅
- _unitOfWorkManage.BeginTran();
-
- #region 鍑哄簱鍗�
- cabinOrder.OutStatus = "寮�濮�";
+ if (cabinOrderDetail.Order_Outqty > cabinOrderDetail.Order_qty) throw new Exception($"鍑哄簱鏁伴噺涓嶅彲瓒呭嚭鍗曟嵁鏁伴噺");
+ deliveryOrder.OutStatus = "寮�濮�";
cabinOrderDetail.OotDetailStatus = "寮�濮�";
- if (cabinOrderDetail.Order_Outqty == cabinOrderDetail.Order_qty)
- {
- cabinOrderDetail.OotDetailStatus = "宸插畬鎴�";
- _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.鑷姩瀹屾垚);
- }
- else
- {
- _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();
- if (cabinOrder1.Details == null || cabinOrder1.Details.Count < 1) cabinOrder.OutStatus = "宸插畬鎴�";
- Repository.UpdateData(cabinOrder);
- #endregion
+ if (cabinOrderDetail.Order_Outqty == cabinOrderDetail.Order_qty) cabinOrderDetail.OotDetailStatus = "宸插畬鎴�";
#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}銆戠殑搴撳瓨淇℃伅");
+ Dt_InventoryInfo inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.LocationCode == supplyTask.LocationCode);
+ if (inventoryInfo == null) throw new Exception($"鏈壘鍒拌揣浣嶃�恵supplyTask.LocationCode}銆戠殑搴撳瓨淇℃伅");
inventoryInfo.StockQuantity -= supplyTask.StockQuantity;
+ inventoryInfo.OutboundQuantity -= supplyTask.StockQuantity;
+ #endregion
+ Dt_LocationInfo location = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == supplyTask.LocationCode);
+ #region 璐т綅
+ if (supplyTask.WarehouseCode != WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"))
+ {
+ if (location == null)
+ return WebResponseContent.Instance.Error($"璇风淮鎶よ揣浣嶇紪鍙枫�恵supplyTask.LocationCode}銆戠殑璐т綅淇℃伅");
+ Dt_InventoryInfo inventoryInfo1 = _inventoryInfoService.Repository.QueryFirst(x => x.LocationCode == supplyTask.LocationCode);
+ if (inventoryInfo1 == null) location.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ }
+ #endregion
+
+ #region 搴撳瓨鎵规 濡傛灉浠诲姟绫诲瀷鏄皟鎷ㄥ嚭搴撲换鍔★紙8锛夊氨涓嶄慨鏀规壒娆″簱瀛�
+ Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode ==
+ inventoryInfo.MaterielCode);
+ if (supplyTask.TaskType != TaskTypeEnum.AllocatOut.ObjToInt())
+ {
+ inventory_Batch.StockQuantity -= supplyTask.StockQuantity;
+ inventory_Batch.OutboundQuantity -= supplyTask.StockQuantity;
+ }
+ #endregion
+ supplyTask.TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt();
+
+ _unitOfWorkManage.BeginTran();
+ if (inventory_Batch.StockQuantity <= 0)
+ _inventory_BatchServices.DeleteData(inventory_Batch);
+ else
+ _inventory_BatchServices.UpdateData(inventory_Batch);
+ _materielInfoService.UpdateData(materielInfo);
if (inventoryInfo.StockQuantity <= 0)
_inventoryInfoService.DeleteData(inventoryInfo);
else
_inventoryInfoService.UpdateData(inventoryInfo);
- #endregion
+ if (location != null) _locationInfoService.UpdateData(location);
+ _deliveryOrderDetailServices.UpdateData(cabinOrderDetail);
+ _supplyTaskService.Repository.DeleteAndMoveIntoHty(supplyTask, OperateTypeEnum.浜哄伐瀹屾垚);
- #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)
+ #region 鍒ゆ柇璇︽儏鏄惁鍏ㄩ儴瀹屾垚
+ if (!_deliveryOrderDetailServices.Repository.QueryData(x => x.DeliveryOrderId == deliveryOrder.Id && x.OotDetailStatus != "宸插畬鎴�").Any())
+ deliveryOrder.OutStatus = "宸插畬鎴�";
+ BaseDal.UpdateData(deliveryOrder);
+ if (supplyTask.WarehouseCode == WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"))
{
- location.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- _basicService.LocationInfoService.UpdateData(location);
+ materielInfo.Business_qty -= supplyTask.StockQuantity;
+ if (materielInfo.Business_qty < materielInfo.MinQty)
+ CreateAllocatInOut(materielInfo);//鍒涘缓璋冩嫧浠诲姟
}
#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.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();
}
catch (Exception ex)
@@ -1001,34 +1171,25 @@
return content;
}
-
- /// <summary>
- /// 骞冲簱浜哄伐鎷ｆ枡鍑哄簱澶勭悊锛堝嵆浜哄伐鎵爜鍑哄簱鏃惰皟鐢級
- /// </summary>
- /// <param name="saveModel"></param>
- /// <returns></returns>
- public WebResponseContent MatPicking(SaveModel saveModel)
+ public WebResponseContent OutTaskFinish(Dt_SupplyTask supplyTask)
{
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($"鍑哄簱鍗曟槑缁嗗凡瀹屾垚");
- Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);
+ 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.OK($"鍑哄簱鍗曞凡瀹屾垚");
+
+ Dt_DeliveryOrderDetail? cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == supplyTask.BatchNo && x.Reservoirarea == supplyTask.WarehouseCode && x.Goods_no == supplyTask.MaterielCode).FirstOrDefault();
+ if (cabinOrderDetail == null) return WebResponseContent.Instance.Error($"鍑哄簱鍗曟槑缁嗘湭鎵惧埌");
+ Dt_MaterielInfo materielInfo = _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($"鍑哄簱鏁伴噺涓嶅彲瓒呭嚭鍗曟嵁鏁伴噺");
- #region 澶勭悊鍑哄簱鍗曪紝璐т綅锛屽簱瀛橈紝搴撳瓨鎵规淇℃伅
- _unitOfWorkManage.BeginTran();
+
+ #region 澶勭悊鍑哄簱鍗曪紝璐т綅锛屽簱瀛橈紝搴撳瓨鎵规淇℃伅,鍑哄簱浠诲姟
+ //_unitOfWorkManage.BeginTran();
#region 鍑哄簱鍗�
cabinOrder.OutStatus = "寮�濮�";
@@ -1036,21 +1197,20 @@
if (cabinOrderDetail.Order_Outqty == cabinOrderDetail.Order_qty)
{
cabinOrderDetail.OotDetailStatus = "宸插畬鎴�";
- _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.鑷姩瀹屾垚);
+ //_deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.鑷姩瀹屾垚);
}
- else
- {
- _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();
- if (cabinOrder1.Details == null || cabinOrder1.Details.Count < 1) cabinOrder.OutStatus = "宸插畬鎴�";
+ _deliveryOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
+ var cabinOrder1 = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == cabinOrder.Out_no && x.Warehouse_no == supplyTask.WarehouseCode && x.Out_type != "20").Includes(x => x.Details).First();
+ if (!cabinOrder1.Details.Where(x => x.OotDetailStatus != "宸插畬鎴�").Any())
+ cabinOrder.OutStatus = "宸插畬鎴�";
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.StockQuantity -= Inqty;
+ Dt_InventoryInfo inventoryInfo = _inventoryInfoService.Repository.QueryFirst(x => x.BatchNo == cabinOrderDetail.Batch_num && x.MaterielCode == cabinOrderDetail.Goods_no && x.LocationCode == supplyTask.LocationCode);
+ if (inventoryInfo == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌揣浣嶃�恵supplyTask.LocationCode}銆戠殑搴撳瓨淇℃伅");
+ inventoryInfo.StockQuantity -= supplyTask.StockQuantity;
+ inventoryInfo.OutboundQuantity -= supplyTask.StockQuantity;
if (inventoryInfo.StockQuantity <= 0)
_inventoryInfoService.DeleteData(inventoryInfo);
else
@@ -1058,59 +1218,104 @@
#endregion
#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)
+ if (supplyTask.WarehouseCode != WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"))
{
- location.LocationStatus = LocationStatusEnum.Free.ObjToInt();
- _basicService.LocationInfoService.UpdateData(location);
+ var location = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == supplyTask.LocationCode);
+ if (location == null)
+ return WebResponseContent.Instance.Error($"璇风淮鎶よ揣浣嶇紪鍙枫�恵supplyTask.LocationCode}銆戠殑璐т綅淇℃伅");
+ //if (location.EnableStatus == EnableStatusEnum.Disable.ObjToInt())
+ // return WebResponseContent.Instance.Error($"璐т綅缂栧彿銆恵supplyTask.LocationCode}銆戝凡绂佺敤锛岃鎭㈠姝ｅ父鍐嶄娇鐢�");
+ Dt_InventoryInfo inventoryInfo1 = _inventoryInfoService.Repository.QueryFirst(x => x.LocationCode == supplyTask.LocationCode);
+ if (inventoryInfo1 == null)
+ {
+ location.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ _locationInfoService.UpdateData(location);
+ }
}
#endregion
- #region 浠诲姟璁板綍
- Dt_SupplyTask supplyTask = new Dt_SupplyTask()
- {
- WarehouseCode = cabinOrderDetail.Reservoirarea,
- BatchNo = inventoryInfo.BatchNo,
- MaterielName = inventoryInfo.MaterielName,
- MaterielCode = inventoryInfo.MaterielCode,
- MaterielSpec = inventoryInfo.MaterielSpec,
- TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt(),
- TaskType = TaskTypeEnum.OutPick.ObjToInt(),
- CreateDate = DateTime.Now,
- Creater = App.User.UserName,
- LocationCode = location.LocationCode,
- OrderNo = cabinOrder.Out_no,
- StockQuantity = Inqty,
- SupplyQuantity = 0,
- Remark = "鍑哄簱"
- };
- _supplyTaskService.AddData(supplyTask);
- #endregion
+ //_supplyTaskService.UpdateData(supplyTask);
+ supplyTask.TaskNum = cabinOrderDetail.Id;
+ supplyTask.TaskStatus = SupplyStatusEnum.OutFinish.ObjToInt();
+ _supplyTaskService.Repository.DeleteAndMoveIntoHty(supplyTask, OperateTypeEnum.浜哄伐瀹屾垚);
- #region 搴撳瓨鎵规
- Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode);
- if (inventory_Batch != null)
+ #region 搴撳瓨鎵规 濡傛灉浠诲姟绫诲瀷鏄皟鎷ㄥ嚭搴撲换鍔★紙8锛夊氨涓嶄慨鏀规壒娆″簱瀛�
+ if (supplyTask.TaskType != TaskTypeEnum.AllocatOut.ObjToInt())
{
- inventory_Batch.StockQuantity -= Inqty;
- if (inventory_Batch.StockQuantity <= 0)
- _inventory_BatchServices.DeleteData(inventory_Batch);
- else
- _inventory_BatchServices.UpdateData(inventory_Batch);
+ Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.BatchNo == inventoryInfo.BatchNo && x.MaterielCode == inventoryInfo.MaterielCode);
+ if (inventory_Batch != null)
+ {
+ inventory_Batch.StockQuantity -= supplyTask.StockQuantity;
+ inventory_Batch.OutboundQuantity -= supplyTask.StockQuantity;
+ if (inventory_Batch.StockQuantity <= 0)
+ _inventory_BatchServices.DeleteData(inventory_Batch);
+ else
+ _inventory_BatchServices.UpdateData(inventory_Batch);
+ }
}
#endregion
-
- _unitOfWorkManage.CommitTran();
+ if (supplyTask.WarehouseCode == WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"))
+ {
+ materielInfo.Business_qty -= supplyTask.StockQuantity;
+ _materielInfoService.UpdateData(materielInfo);
+ if (materielInfo.Business_qty < materielInfo.MinQty)
+ CreateAllocatInOut(materielInfo);//鍒涘缓璋冩嫧浠诲姟
+ }
+ //_unitOfWorkManage.CommitTran();
#endregion
-
- content.OK(cabinOrderDetail.Order_Outqty.ToString());
+ content.OK();
}
catch (Exception ex)
{
- _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+
+ /// <summary>
+ /// 浜哄伐鍦ㄥ嚭搴撳崟涓偣鍑诲畬鎴愭寜閽疄鐜颁笂鎶�
+ /// </summary>
+ /// <param name="key">id</param>
+ /// <returns></returns>
+ public WebResponseContent FinishOutOrder(int key)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_DeliveryOrder deliveryOrder = BaseDal.QueryFirst(x => x.Id == key);
+ List<Dt_DeliveryOrder> deliveryOrders = Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == deliveryOrder.Out_no).Includes(x => x.Details).ToList();//鎵惧嚭鎵�鏈夊嚭搴撳崟鍙风浉鍚岀殑鍑哄簱鍗�
+ List<Dt_DeliveryOrderDetail> deliveryOrderDetails = new List<Dt_DeliveryOrderDetail>();
+ foreach (var item in deliveryOrders)
+ {
+ if (item.Details != null) deliveryOrderDetails.AddRange(item.Details);
+ item.Modifier = App.User.UserName;
+ item.ModifyDate = DateTime.Now;
+ item.Details = null;
+ }
+ if (deliveryOrder.Out_type == OutOrderTypeEnum.Allocate.ObjToInt().ToString())
+ {
+ _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(deliveryOrderDetails, OperateTypeEnum.浜哄伐瀹屾垚);
+ BaseDal.DeleteAndMoveIntoHty(deliveryOrders, OperateTypeEnum.浜哄伐瀹屾垚);
+ }
+ else
+ {
+ var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
+ if (deliveryOrder.Out_type == "3") url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";
+ var requestDate = new
+ {
+ order_no = deliveryOrder.Out_no
+ };
+ var result = HttpHelper.Post(url, requestDate.ToJsonString());
+ var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
+ if (response == null) throw new Exception("涓婃姤ERP鍑哄簱鍗曞畬鎴愬け璐ワ紒");
+ if (response.resultCode != "0" && response.resultMsg != "鏈壘鍒板悎娉曞崟鎹�") throw new Exception(response.resultMsg);
+ _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(deliveryOrderDetails, OperateTypeEnum.浜哄伐瀹屾垚);
+ BaseDal.DeleteAndMoveIntoHty(deliveryOrders, OperateTypeEnum.浜哄伐瀹屾垚);
+ }
+ content.OK();
+ }
+ catch (Exception ex)
+ {
content.Error(ex.Message);
}
return content;
--
Gitblit v1.9.3