From 24e1afea871c5f24d6018f560389359e143031cd Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 27 十月 2025 10:45:16 +0800
Subject: [PATCH] 添加出入库单人工完成功能
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 1180 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 666 insertions(+), 514 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
index 44e7072..d744bac 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs"
@@ -1,5 +1,7 @@
锘縰sing HslCommunication;
using MailKit.Search;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Data.SqlClient;
using Newtonsoft.Json;
using SqlSugar;
using System;
@@ -8,12 +10,20 @@
using System.Text;
using System.Threading.Tasks;
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.SquareCabin;
using WIDESEA_IBasicService;
using WIDESEA_ISquareCabinServices;
+using WIDESEA_IWMsInfoServices;
using WIDESEA_Model.Models;
using static System.Net.WebRequestMethods;
@@ -25,211 +35,409 @@
{
public class CabinOrderServices : ServiceBase<Dt_CabinOrder, IRepository<Dt_CabinOrder>>, ICabinOrderServices
{
-
- static string SearchDate = "";
private readonly IBasicService _basicService;
private readonly IMedicineGoodsServices _medicineGoodsServices;
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly IInventory_BatchServices _inventory_BatchServices;
+ private readonly IInventoryInfoService _inventoryInfoService;
+ private readonly ICabinOrderDetailServices _cabinOrderDetailServices;
+ private readonly ISupplyTaskService _supplyTaskService;
+ private readonly ISupplyTaskHtyService _supplyTaskHtyService;
+ private readonly IMessageInfoService _messageInfoService;
+ public IRepository<Dt_CabinOrder> Repository => BaseDal;
- public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IBasicService basicService, IMedicineGoodsServices medicineGoodsServices) : base(BaseDal)
+ public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal, IBasicService basicService, IMedicineGoodsServices medicineGoodsServices, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, ICabinOrderDetailServices cabinOrderDetailServices, ICabinOrderHtyServices cabinOrderHtyServices, ICabinOrderDetailHtyServices cabinOrderDetailHtyServices, ISupplyTaskService supplyTaskService, ISupplyTaskHtyService supplyTaskHtyService, IMessageInfoService messageInfoService) : base(BaseDal)
{
_basicService = basicService;
- _medicineGoodsServices = medicineGoodsServices;
+ _medicineGoodsServices = medicineGoodsServices;
+ _unitOfWorkManage = unitOfWorkManage;
+ _inventory_BatchServices = inventory_BatchServices;
+ _inventoryInfoService = inventoryInfoService;
+ _cabinOrderDetailServices = cabinOrderDetailServices;
+ _supplyTaskService = supplyTaskService;
+ _supplyTaskHtyService = supplyTaskHtyService;
+ _messageInfoService = messageInfoService;
+ }
+
+
+
+ /// <summary>
+ /// pda鏌ヨ鍑哄簱鍗曚俊鎭�
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ public WebResponseContent GetCabinOrders(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_CabinOrder> dt_ReceiveOrders = new List<Dt_CabinOrder>();
+ if (string.IsNullOrEmpty(orderNo))
+ {
+ dt_ReceiveOrders = Db.Queryable<Dt_CabinOrder>().Where(x => (x.OdrderStatus == "鏂板缓" || x.OdrderStatus == "寮�濮�") && x.Warehouse_no == warehouseCode).Includes(x => x.Details).OrderByDescending(x => x.CreateDate).ToPageList(pageNo, 5);
+ }
+ else
+ {
+ dt_ReceiveOrders = Db.Queryable<Dt_CabinOrder>().Where(x => (x.Order_no.Contains(orderNo) || x.Supplier_no.Contains(orderNo)) && (x.OdrderStatus == "鏂板缓" || x.OdrderStatus == "寮�濮�") && 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>
- /// 鑾峰彇涓婃父绯荤粺鐨勫叆搴撳崟
+ /// pda鏌ョ湅鍏ュ簱璇︽儏琛�
/// </summary>
- /// <param name="searchDate"></param>
+ /// <param name="pageNo"></param>
+ /// <param name="orderNo"></param>
/// <returns></returns>
- //public WebResponseContent GetUpstreamOrder(DateTime searchDate)
- //{
- // var responseContent = new WebResponseContent();
-
- // try
- // {
- // // 璇锋眰鍦板潃
- // var url = "http://127.0.0.1:9090/GYZ2/95fck/inOrder";
-
- // //// 璇锋眰鍙傛暟
- // var requestData = new
- // {
- // searchDate = searchDate.ToString("yyyy-MM-dd HH:mm:ss")
- // };
-
- // // 鍙戣捣璇锋眰
- // var result = HttpHelper.Post(url, requestData.ToJsonString());
-
- // // 鍙嶅簭鍒楀寲
- // var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstreamOrderInfo>>(result);
-
- // if (response.resultCode != "0")
- // {
- // // 璋冪敤寮傚父鎺ュ彛
- // SendErrorToUpstream(1, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
- // return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
- // }
-
- // if (response.data == null || !response.data.Any())
- // {
- // return responseContent.OK("鏃犳柊鍏ュ簱鍗曟暟鎹�");
- // }
-
- // Db.Ado.BeginTran();
- // List<Dt_CabinOrder> _CabinOrders = new List<Dt_CabinOrder>();
- // foreach (var order in response.data)
- // {
- // try
- // {
- // // 鎻掑叆鍏ュ簱鍗曡〃
- // var entityOrder = new Dt_CabinOrder
- // {
-
- // Order_no = order.order_no,
- // Order_type = order.order_type,
- // Supplier_no = order.supplier_no,
- // Account_tiem = order.account_time,
- // OdrderStatus = "鏂板缓",
- // };
- // //var orderId = Db.Insertable(entityOrder).ExecuteReturnIdentity(); //灏辨槸杩斿洖涓婚敭ID銆�
-
- // // 鎻掑叆鍏ュ簱鏄庣粏琛�
- // var detailEntities = order.details.Select(d => new Dt_CabinOrderDetail
- // {
- // //OrderId= orderId,
- // Goods_no = d.goods_no,
- // Order_qty = d.order_qty,
- // Batch_num = d.batch_num,
- // Exp_date = d.exp_date,
- // Warehouse_no = d.warehouse_no,
- // Status = 0,
- // }).ToList();
- // entityOrder.Details.AddRange(detailEntities); //寤虹珛涓诲璞′笌瀛愬璞＄殑鍏宠仈鍏崇郴
- // _CabinOrders.Add(entityOrder);
-
- // //鑷繁
- // /// Db.Insertable(detailEntities).ExecuteCommand();
-
- // //杩欓噷瑕佽皟鐢ㄤ竴涓帴鍙ｅ皢涓婇潰鐨勪俊鎭紶缁檞cs锛岀劧鍚庢敼鍙樼姸鎬�
- // }
- // catch (Exception innerEx)
- // {
- // // 閽堝鏌愭潯璁㈠崟鎶ラ敊鏃讹紝鎺ㄩ�佸紓甯哥粰涓婃父
- // SendErrorToUpstream(1, order.order_no, innerEx.Message, "");
- // throw; // 鎶涘嚭寮傚父锛岃澶栧眰鎹曡幏鍥炴粴
- // }
- // }
- // // 鎵归噺鎻掑叆锛圫qlSugar鑷姩澶勭悊涓诲閿叧绯伙級
- // Db.Insertable(_CabinOrders).ExecuteCommand();
- // Db.Ado.CommitTran();
-
- // //濡傛灉EdiIn瀹屾垚閭ｄ箞灏辫皟鐢–ompleteOrder鎺ュ彛
-
- // return responseContent.OK("鍚屾鍏ュ簱鍗曟垚鍔�");
- // }
- // catch (Exception ex)
- // {
- // // 鍏ㄥ眬寮傚父鏃讹紝涔熸帹閫佸紓甯哥粰涓婃父
- // SendErrorToUpstream(1, "", ex.Message, "");
- // Db.Ado.RollbackTran();
- // return responseContent.Error("鍚屾澶辫触: " + ex.Message);
- // }
- //}
-
-
- public WebResponseContent GetUpstreamOrder()
+ public WebResponseContent GetCabinOrderDetail(int pageNo, string orderNo)
{
- var responseContent = new WebResponseContent();
+ WebResponseContent content = new WebResponseContent();
+ Dt_CabinOrder cabinOrder = Db.Queryable<Dt_CabinOrder>().Includes(x => x.Details).First(x => x.Order_no == orderNo);
+ List<Dt_CabinOrderDetail> cabinOrderDetails = cabinOrder.Details.Where(x => x.Status == 2 && x.OrderDetailStatus != "宸插畬鎴�").ToList();
+ content.OK(data: cabinOrderDetails);
+ return content;
+ }
+
+
+ /// <summary>
+ /// Pad鍏ュ簱瀹屾垚
+ /// </summary>
+ /// <param name="saveModel"></param>
+ /// <returns></returns>
+ public WebResponseContent FeedbackIn([FromBody] SaveModel saveModel)
+ {
+ WebResponseContent content = new WebResponseContent();
try
{
- // 璇锋眰鍦板潃
- var url = "http://121.37.118.63:80/GYZ2/95fck/inOrder";
- //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 LocationCode = saveModel.MainData["LocationCode"].ToString();
+ var orderNo = saveModel.MainData["orderNo"].ToString();
+ var batchNo = saveModel.MainData["batchNo"].ToString();
+ var materielCode = saveModel.MainData["materielCode"].ToString();
+ var Inqty = saveModel.MainData["Inqty"].ObjToInt();
+ var warehouseCode = saveModel.MainData["warehouseCode"].ToString();
+ Dt_CabinOrder cabinOrder = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == orderNo && x.Warehouse_no == warehouseCode).Includes(x => x.Details).First();
+ if (cabinOrder == null || cabinOrder.OdrderStatus == "宸插畬鎴�")
+ return WebResponseContent.Instance.Error($"鍏ュ簱鍗曞凡瀹屾垚");
+ Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Goods_no == materielCode && x.Batch_num == batchNo && x.Status == 2).FirstOrDefault();
+ if (cabinOrderDetail == null || cabinOrderDetail.OrderDetailStatus == "宸插畬鎴�")
+ 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_Inqty += Inqty;
+ if (cabinOrderDetail.Order_Inqty > cabinOrderDetail.Order_qty)
+ return WebResponseContent.Instance.Error($"鍏ュ簱鏁伴噺涓嶅彲瓒呭嚭鍗曟嵁鏁伴噺");
- // 鍙嶅簭鍒楀寲
- var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstreamOrderInfo>>(result);
+ #region 澶勭悊鍏ュ簱鍗曪紝璐т綅锛屽簱瀛橈紝搴撳瓨鎵规淇℃伅
+ _unitOfWorkManage.BeginTran();
- if (response.resultCode != "0")
+ #region 鍏ュ簱鍗�
+ cabinOrder.OdrderStatus = "寮�濮�";
+ cabinOrderDetail.OrderDetailStatus = "寮�濮�";
+ if (cabinOrderDetail.Order_Inqty == cabinOrderDetail.Order_qty)
{
- // 璋冪敤寮傚父鎺ュ彛
- SendErrorToUpstream(1, "", response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触", "");
- return responseContent.Error(response.resultMsg ?? "涓婃父鎺ュ彛杩斿洖澶辫触");
+ cabinOrderDetail.OrderDetailStatus = "宸插畬鎴�";
}
+ _cabinOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
+ var cabinOrder1 = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no && x.Warehouse_no == warehouseCode).Includes(x => x.Details).First();
+ if (!cabinOrder1.Details.Where(x => x.OrderDetailStatus != "宸插畬鎴�").Any()) cabinOrder.OdrderStatus = "宸插畬鎴�";
+ Repository.UpdateData(cabinOrder);
+ #endregion
- if (response.data == null || !response.data.Any())
+ #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}銆戝凡绂佺敤锛岃鎭㈠姝ｅ父鍐嶄娇鐢�");
+ if (location.WarehouseCode != cabinOrderDetail.Reservoirarea)
+ return WebResponseContent.Instance.Error($"璐т綅缂栧彿銆恵LocationCode}銆戞墍灞炲簱鎴夸笌褰撳墠鍏ュ簱鍗曟墍灞炲簱鎴夸笉鍖归厤");
+ if (location.LocationStatus == LocationStatusEnum.Free.ObjToInt())
{
- return responseContent.OK("鏃犳柊鍏ュ簱鍗曟暟鎹�");
+ location.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+ _basicService.LocationInfoService.UpdateData(location);
}
- // 鑾峰彇鎵�鏈夊凡瀛樺湪鐨勫叆搴撳崟鍙�
- var existingOrderNos = BaseDal.Db.Queryable<Dt_CabinOrder>()
- .Select(x => x.Order_no)
- .ToList();
+ #endregion
- // 杩囨护鎺夊凡瀛樺湪鐨勫叆搴撳崟
- var newOrders = response.data
- .Where(order => !existingOrderNos.Contains(order.order_no))
- .ToList();
-
- if (!newOrders.Any())
+ #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 responseContent.OK("鎵�鏈夊叆搴撳崟宸插瓨鍦紝鏃犻渶鏂板");
+ inventoryInfo.StockQuantity += Inqty;
+ inventoryInfo.AvailableQuantity += Inqty;
+ inventoryInfo.InDate = DateTime.Now;
+ _inventoryInfoService.UpdateData(inventoryInfo);
}
-
- Db.Ado.BeginTran();
- try
+ else
{
- List<Dt_CabinOrder> _CabinOrders = new List<Dt_CabinOrder>();
- //瀛樺偍鍏ュ簱鍗曞彿
- List<string> orderNos = new List<string>();
-
- foreach (var order in newOrders)
+ inventoryInfo = new Dt_InventoryInfo()
{
- var entityOrder = new Dt_CabinOrder
+ LocationCode = LocationCode,
+ MaterielCode = materielInfo.MaterielCode,
+ MaterielName = materielInfo.MaterielName,
+ MaterielSpec = materielInfo.MaterielSpec,
+ OutboundQuantity = 0,
+ StockQuantity = Inqty,
+ AvailableQuantity = Inqty,
+ StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt(),
+ ValidityPeriod = cabinOrderDetail.Exp_date,
+ WarehouseCode = cabinOrderDetail.Reservoirarea,
+ SupplyQuantity = 0,
+ InDate = DateTime.Now,
+ BatchNo = cabinOrderDetail.Batch_num,
+ Creater = App.User.UserName,
+ CreateDate = DateTime.Now,
+ };
+ _inventoryInfoService.AddData(inventoryInfo);
+ }
+ #endregion
+
+ #region 浠诲姟璁板綍
+ #region MyRegion
+ //Dt_SupplyTask supplyTask = new Dt_SupplyTask()
+ //{
+ // WarehouseCode = cabinOrderDetail.Reservoirarea,
+ // TaskNum = cabinOrderDetail.Id,
+ // TaskStatus = SupplyStatusEnum.InFinish.ObjToInt(),
+ // BatchNo = inventoryInfo.BatchNo,
+ // MaterielName = inventoryInfo.MaterielName,
+ // MaterielCode = inventoryInfo.MaterielCode,
+ // MaterielSpec = inventoryInfo.MaterielSpec,
+ // TaskType = TaskTypeEnum.InPick.ObjToInt(),
+ // CreateDate = DateTime.Now,
+ // Creater = App.User.UserName,
+ // LocationCode = location.LocationCode,
+ // OrderNo = cabinOrder.Order_no,
+ // StockQuantity = Inqty,
+ // SupplyQuantity = 0,
+ // Remark = "鍏ュ簱"
+ //};
+ //_supplyTaskService.AddData(supplyTask);
+ #endregion
+ Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
+ {
+ WarehouseCode = cabinOrderDetail.Reservoirarea,
+ TaskNum = cabinOrderDetail.Id,
+ OperateType = OperateTypeEnum.浜哄伐瀹屾垚.ToString(),
+ InsertTime = DateTime.Now,
+ TaskStatus = SupplyStatusEnum.InFinish.ObjToInt(),
+ BatchNo = inventoryInfo.BatchNo,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ TaskType = cabinOrder.Order_type == "1" ? TaskTypeEnum.In.ObjToInt() : TaskTypeEnum.OutReturn.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ LocationCode = location.LocationCode,
+ OrderNo = cabinOrder.Order_no,
+ StockQuantity = Inqty,
+ SupplyQuantity = 0,
+ Remark = "鍏ュ簱"
+ };
+ _supplyTaskHtyService.AddData(supplyTask_Hty);
+ #endregion
+
+ #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 += Inqty;
+ inventory_Batch.AvailableQuantity += Inqty;
+ _inventory_BatchServices.UpdateData(inventory_Batch);
+ }
+ else
+ {
+ 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.StockQuantity,
+ ValidityPeriod = inventoryInfo.ValidityPeriod,
+ SupplyQuantity = inventoryInfo.SupplyQuantity,
+ };
+ _inventory_BatchServices.AddData(inventory_Batch);
+ }
+ #endregion
+
+ _unitOfWorkManage.CommitTran();
+ #endregion
+
+ content.OK(cabinOrderDetail.Order_Inqty.ToString());
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+
+ #region 鍒涘缓鍏ュ簱鍗�
+ /// <summary>
+ /// 鍒涘缓鍏ュ簱鍗�,杩斿洖涓�涓叆搴撳崟闆嗗悎鍒癲ata
+ /// </summary>
+ public WebResponseContent CreateInboundOrder(UpstreamOrderInfo order)
+ {
+ WebResponseContent webResponseContent = new WebResponseContent();
+ try
+ {
+ string WareCodeMJ = WarehouseEnum.楹荤簿搴�.ObjToInt().ToString("000");
+ string WareCodeLD = WarehouseEnum.鍐峰喕搴�.ObjToInt().ToString("000");
+ List<Dt_CabinOrder> dt_CabinOrders = new List<Dt_CabinOrder>();
+ #region 鐗规畩鑽搧鍏ョ壒娈婂簱鎴�
+ if (order.warehouse_no == WareCodeMJ || order.warehouse_no == WareCodeLD)
+ {
+ var entityOrder = new Dt_CabinOrder
+ {
+ Order_no = order.order_no,
+ Order_type = order.order_type,
+ Supplier_no = order.supplier_no,
+ Account_tiem = order.account_time,
+ OdrderStatus = "鏂板缓",
+ Supplier_name = order.supplier_name,
+ Warehouse_no = order.warehouse_no,
+ Details = order.details.Select(d => new Dt_CabinOrderDetail
{
- Order_no = order.order_no,
- //鍏ュ簱鍗曠被鍨�
- Order_type = order.order_type,
- Supplier_no = order.supplier_no,
- Account_tiem = order.account_time,
- OdrderStatus = "鏂板缓",
- Supplier_name = order.supplier_name,
- Warehouse_no = order.warehouse_no,
- Details = new List<Dt_CabinOrderDetail>()
- //Details = order.details.Select(d => new Dt_CabinOrderDetail
- //{
- // //OrderId 瑕佹嬁鍒板叆搴撳崟琛ㄤ腑鐨刬d锛屽浣曟嬁涓嶅埌灏卞皢杩欎釜瀛楁鏀逛簡锛屾敼鎴愬叆搴撳崟鍙�
- // // SqlSugar InsertNav宸ヤ綔鍘熺悊鍏堟彃鍏ヤ富琛� (Dt_CabinOrder)//鑾峰彇鐢熸垚鐨勪富閿甀D//鑷姩璁剧疆瀛愯〃鐨勫叧鑱斿瓧娈� (OrderId)//鍐嶆彃鍏�(Dt_CabinOrderDetail)
- // Goods_no = d.goods_no,
- // Order_qty = d.order_qty,
- // Batch_num = d.batch_num,
- // Exp_date = d.exp_date,
- // OrderDetailStatus = "鏂板缓",
- // Status = order.warehouse_no == "001" ? 0 : 2, //濡傛灉鏄�001鎴块偅涔堝氨鏄湭鍚屾鐘舵�侊紝濡傛灉涓嶆槸001鎴块偅涔堝氨鏄棤闇�鍚屾鐘舵��
- //}).ToList()
- };
- foreach (var item in order.details)
+ Goods_no = d.goods_no,
+ Order_qty = Math.Abs(d.order_qty),
+ Batch_num = d.batch_num,
+ Exp_date = d.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 2, //濡傛灉鏄�001鎴块偅涔堝氨鏄湭鍚屾鐘舵�侊紝濡傛灉涓嶆槸001鎴块偅涔堝氨鏄棤闇�鍚屾鐘舵��
+ }).ToList()
+ };
+ dt_CabinOrders.Add(entityOrder);
+ webResponseContent.OK(data: dt_CabinOrders);
+ }
+ #endregion
+ else
+ {
+ var entityOrder = new Dt_CabinOrder//澶т欢搴撹鍗�
+ {
+ Order_no = order.order_no,
+ Order_type = order.order_type,
+ Supplier_no = order.supplier_no,
+ Account_tiem = order.account_time,
+ OdrderStatus = "鏂板缓",
+ Supplier_name = order.supplier_name,
+ Warehouse_no = WarehouseEnum.澶т欢搴�.ObjToInt().ToString("000"),
+ Details = new List<Dt_CabinOrderDetail>()
+ };
+ var entityOrderLK = new Dt_CabinOrder//绔嬪簱璁㈠崟
+ {
+ Order_no = order.order_no,
+ Order_type = order.order_type,
+ Supplier_no = order.supplier_no,
+ Account_tiem = order.account_time,
+ OdrderStatus = "鏂板缓",
+ Supplier_name = order.supplier_name,
+ Warehouse_no = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"),
+ Details = new List<Dt_CabinOrderDetail>()
+ };
+ foreach (var item in order.details)
+ {
+ // 灏嗕笂娓稿叆搴撴暟閲忚浆涓烘鏁�
+ item.order_qty = Math.Abs(item.order_qty);
+ #region 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅
+ Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == item.goods_no);
+ if (materielInfo == null) throw new Exception($"鏈壘鍒拌嵂鍝佺紪鐮併�恵item.goods_no}銆戠殑淇℃伅");
+ if (!Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
+ throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵item.goods_no}銆戠殑灞炴�у垎绫�");
+ if (materielInfo.BoxQty < 1) throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵item.goods_no}銆戠殑绠辫鏁伴噺");
+ if (materielInfo.MinQty < 1) throw new Exception($"璇疯缃嵂鍝佺紪鍙枫�恵item.goods_no}銆戠殑绔嬪簱鏈�浣庡簱瀛樻暟");
+ #endregion
+ #region 澶т欢
+ if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)//濡傛灉鐗╂枡鏄ぇ浠�
{
- // 灏嗕笂娓稿叆搴撴暟閲忚浆涓烘鏁�
- item.order_qty = Math.Abs(item.order_qty);
- #region 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡淇℃伅
- //Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == item.goods_no);
- Dt_MedicineGoods materielInfo = BaseDal.Db.Queryable<Dt_MedicineGoods>().Where(x => x.Goods_no == item.goods_no).First();
- ///鏍规嵁鐗╂枡淇℃伅澶у皬浠跺睘鎬у尯鍒嗘槸鍚﹀叆绔嬪簱 //澶т欢鍏ュ钩搴�
- if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)
+ Dt_CabinOrderDetail orderDetail = new Dt_CabinOrderDetail()
{
- Dt_CabinOrderDetail orderDetail = new Dt_CabinOrderDetail()
+ Reservoirarea = entityOrder.Warehouse_no,
+ Goods_no = item.goods_no,
+ Order_qty = item.order_qty,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 2
+ };
+ entityOrder.Details.Add(orderDetail);
+ }
+ #endregion
+ else
+ {
+ Dt_CabinOrderDetail orderDetail = null;
+ var ys = item.order_qty % materielInfo.BoxQty; //涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
+ var xs = (int)(item.order_qty / materielInfo.BoxQty);//淇濈暀鏁存暟
+ #region 鍒ゆ柇鏄惁鏈夋暎浠�
+ if (ys > 0)
+ {
+ orderDetail = new Dt_CabinOrderDetail()
{
- Reservoirarea= order.warehouse_no,
+ Reservoirarea = entityOrderLK.Warehouse_no,
Goods_no = item.goods_no,
- Order_qty = item.order_qty,
+ Order_qty = ys,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 0
+ };
+ materielInfo.Business_qty += ys;
+ }
+ #endregion
+
+ #region 鍒ゆ柇绔嬪簱搴撳瓨鏄惁澶т簬绔嬪簱鏈�浣庡簱瀛樻暟
+ while (materielInfo.Business_qty < materielInfo.MinQty && xs > 0) //褰撲笟鍔℃暟閲忓拰鏁寸鏁伴兘澶т簬0鐨勬椂鍊欐墠浼氬仠姝㈠惊鐜�
+ {
+ xs--;
+ if (orderDetail == null)
+ {
+ orderDetail = new Dt_CabinOrderDetail()
+ {
+ Reservoirarea = entityOrderLK.Warehouse_no,
+ Goods_no = item.goods_no,
+ Order_qty = materielInfo.BoxQty,
+ Batch_num = item.batch_num,
+ Exp_date = item.exp_date,
+ OrderDetailStatus = "鏂板缓",
+ Status = 0
+ };
+ materielInfo.Business_qty += materielInfo.BoxQty;
+ }
+ else
+ {
+ orderDetail.Order_qty += materielInfo.BoxQty;
+ materielInfo.Business_qty += materielInfo.BoxQty;
+ }
+ }
+
+ if (orderDetail != null) entityOrderLK.Details.Add(orderDetail);
+ #endregion
+
+ #region 鍓╀綑鏁翠欢鍏ュ钩搴�
+ if (xs > 0)
+ {
+ orderDetail = new Dt_CabinOrderDetail()
+ {
+ Reservoirarea = entityOrder.Warehouse_no,
+ Goods_no = item.goods_no,
+ Order_qty = materielInfo.BoxQty * xs,
Batch_num = item.batch_num,
Exp_date = item.exp_date,
OrderDetailStatus = "鏂板缓",
@@ -237,391 +445,335 @@
};
entityOrder.Details.Add(orderDetail);
}
- else
- {
- Dt_CabinOrderDetail orderDetail = null;
- var ys = item.order_qty % materielInfo.BoxQty; //涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
- var xs = item.order_qty / materielInfo.BoxQty;//鏁寸鏁伴噺
- #region 鐢熸垚绔嬪簱鍏ュ簱鍗�
-
- #region 鍒ゆ柇鏄惁鏈夋暎浠�
- if (ys > 0)
- {
- orderDetail = new Dt_CabinOrderDetail()
- {
- Reservoirarea = order.warehouse_no,
- Goods_no = item.goods_no,
- Order_qty = ys,
- Batch_num = item.batch_num,
- Exp_date = item.exp_date,
- OrderDetailStatus = "鏂板缓",
- Status = 0
- };
- materielInfo.Business_qty += ys;
- }
- #endregion
-
- #region 鍒ゆ柇绔嬪簱搴撳瓨鏄惁澶т簬绔嬪簱鏈�浣庡簱瀛樻暟
- while (materielInfo.Business_qty < materielInfo.MinQty && xs > 0)
- {
- xs--;
- if (orderDetail == null)
- {
- orderDetail = new Dt_CabinOrderDetail()
- {
- Reservoirarea = order.warehouse_no,
- Goods_no = item.goods_no,
- Order_qty = materielInfo.BoxQty,
- Batch_num = item.batch_num,
- Exp_date = item.exp_date,
- OrderDetailStatus = "鏂板缓",
- Status = 0
- };
- materielInfo.Business_qty += materielInfo.BoxQty;
- }
- else
- {
- orderDetail.Order_qty += materielInfo.BoxQty;
- materielInfo.Business_qty += materielInfo.BoxQty;
- }
- }
- #endregion
-
- if (orderDetail != null) entityOrder.Details.Add(orderDetail);
- #endregion
-
- #region 鍓╀綑鏁翠欢鍏ュ钩搴�
- if (xs > 0)
- {
- orderDetail = new Dt_CabinOrderDetail()
- {
- Reservoirarea = order.warehouse_no,
- Goods_no = item.goods_no,
- Order_qty = materielInfo.BoxQty * xs,
- Batch_num = item.batch_num,
- Exp_date = item.exp_date,
- OrderDetailStatus = "鏂板缓",
- Status = 2
- };
- entityOrder.Details.Add(orderDetail);
- }
- #endregion
- }
- //_basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
- _medicineGoodsServices.Db.Updateable(materielInfo).ExecuteCommand();
#endregion
}
- _CabinOrders.Add(entityOrder);
- orderNos.Add(order.order_no);
- };
- BaseDal.Db.InsertNav(_CabinOrders).Include(x => x.Details).ExecuteCommand();
-
- //鍦ㄤ笅鍙戠粰wcs
- //var reslut= EdiIn(); //鍙戠粰涓嬫父
- //濡傛灉杩欎釜鏂规硶鎴愬姛浜嗭紝閭ｄ箞灏辫皟鐢–ompleteOrder鎺ュ彛锛岀劧鍚庢敼鍙�
- Db.Ado.CommitTran();
- return responseContent.OK("鍚屾鍏ュ簱鍗曟垚鍔�");
- }
- catch (Exception ex)
- {
- Db.Ado.RollbackTran();
- SendErrorToUpstream(1, "", ex.Message, "");
- return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+ _basicService.MaterielInfoService.Repository.UpdateData(materielInfo);
+ }
+ if (entityOrder.Details.Count > 0) dt_CabinOrders.Add(entityOrder);
+ if (entityOrderLK.Details.Count > 0) dt_CabinOrders.Add(entityOrderLK);
+ webResponseContent.OK(data: dt_CabinOrders);
}
}
catch (Exception ex)
{
- // 鍏ㄥ眬寮傚父鏃讹紝涔熸帹閫佸紓甯哥粰涓婃父
- SendErrorToUpstream(1, "", ex.Message, "");
- return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+ webResponseContent.Error(ex.Message);
}
+ return webResponseContent;
}
+ #endregion
- /// <summary>
- /// 浼犵粰wcs
- /// </summary>
- public WebResponseContent EdiIn()
+ #region 鍒涘缓鐩樼泩鍏ュ簱鍗�
+ public WebResponseContent CreateCheckInOrder(UpstreamOrderInfo order)
{
+ WebResponseContent content = new WebResponseContent();
try
{
- //2.鏌ヨ绗﹀悎鏉′欢鐨勮鍗曪紙琛ㄥご = 鏂板缓 && 鍖呭惈鏈夋晥鏄庣粏锛�
- //var orders = BaseDal.Db.Queryable<Dt_CabinOrder>()
- // .Where(o => o.OdrderStatus == "鏂板缓")
- // .Includes(o => o.Details, d => d.MedicineGoods)
- // .ToList();
- //鏌ュ嚭鍖呭惈鍏ㄩ儴鐨勫叆搴撳崟锛屽寘鍚叏閮ㄦ槑缁�+涓�涓槑缁嗗搴斾竴涓晢鍝�
- var orders = BaseDal.Db.CopyNew()
- .Queryable<Dt_CabinOrder>()
- .Where(o => o.OdrderStatus == "鏂板缓")
- .Includes(o => o.Details, d => d.MedicineGoods)
- .ToList();
- // 3. 鍐嶈繃婊ゆ帀涓嶇鍚堟潯浠剁殑鏄庣粏锛堝彧淇濈暀 Status=0锛�
- foreach (var order in orders)
+ string WareCodeMJ = WarehouseEnum.楹荤簿搴�.ObjToInt().ToString("000");
+ string WareCodeLD = WarehouseEnum.鍐峰喕搴�.ObjToInt().ToString("000");
+ #region 鐗规畩搴撴埧
+ if (order.warehouse_no == WareCodeMJ || order.warehouse_no == WareCodeLD)
{
- order.Details = order.Details.Where(d => d.Status == 0).ToList();
- }
-
- if (orders == null || !orders.Any())
- {
- Console.WriteLine("娌℃湁绗﹀悎鏉′欢鐨勮鍗曢渶瑕佹帹閫�");
- return WebResponseContent.Instance.Error("娌℃湁绗﹀悎鏉′欢鐨勮鍗曢渶瑕佹帹閫�");
- }
-
-
- // 4. 閬嶅巻璁㈠崟锛岀粍瑁� DTO 骞舵帹閫�
- foreach (var order in orders)
- {
- string materialCode = "YY";//榛樿鍊�
- //鑾峰彇褰撳墠璁㈠崟鐨勭涓�涓槑缁嗛」
- var firstDetail = order.Details.FirstOrDefault();
- if (firstDetail?.MedicineGoods != null && !string.IsNullOrEmpty(firstDetail.MedicineGoods.MaterialCode))
+ #region 搴撳瓨銆佸簱瀛樻壒娆″钩璐�
+ foreach (var item in order.details)
{
- //濡傛灉鏉′欢婊¤冻锛屽皢鐗╂枡浠ｇ爜璁剧疆涓虹涓�涓槑缁嗛」瀵瑰簲鐨勮嵂鍝佺墿鏂欎唬鐮�
- materialCode = firstDetail.MedicineGoods.MaterialCode;
- }
-
- var ediDto = new ToediInInfo
- {
-
- //瀹㈡埛浠ｇ爜
- customerCode = "905",
- //鐗╂枡绫诲瀷
- materialCode = materialCode,
- //鍏ュ簱鍗曞彿
- externalOrderNo = order.Order_no,
- //鍏ュ簱鍗曠被鍨�
- inOrderType = order.Order_type == "1" ? "10" : "20",
- //浼樺厛绾�
- priority = 0,
- //鏄惁鍙栨秷
- Is_cancel = 0,
- details = order.Details.Select(d => new ToediInDetail
+ //鎵惧簱瀛樻壒娆′俊鎭�
+ Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num);
+ var Qty = Math.Abs(inventory_Batch.StockQuantity - inventory_Batch.SupplyQuantity);
+ if (Qty != item.order_qty) throw new Exception($"鐩樼泩鍏ュ簱鍗曘�恵order.order_no}銆戠墿鏂欑紪鍙枫�恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戠殑鐩樼泩鏁伴噺鏈夎");
+ //鎵炬墍鏈夊簱瀛�
+ List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo);
+ foreach (var inventoryInfo in inventoryInfos)
{
- //鎵瑰彿
- batchNo = d.Batch_num,
- //浜у搧
- productCode = d.Goods_no,
- //sku鍚嶇О
- productName = d.MedicineGoods?.Goods_spm,
- //sku瑙勬牸
- productSpecifications = d.MedicineGoods?.Model,
- //鏁伴噺
- quantity = (int)d.Order_qty,
- //鏁堟湡
- validityPeriod = d.Exp_date,
- //鐢熶骇鍘傚
- manufacturer = d.MedicineGoods?.Factory,
- //鎴垮彿
- libraryNo = order.Warehouse_no,
- //鐩樼泩鍏ュ簱
- //stocktakingDetails = new List<ToediInStock>()
- //stocktakingDetails = new List<ToediInStock>()
- //{
- // new ToediInStock
- // {
- // //鏂欑鍙�
- // palletCode = "PDA001",
- // //鏁伴噺
- // quantity = d.Order_qty.ToString()
- // }
- // }
+ #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.InFinish.ObjToInt(),
+ BatchNo = inventoryInfo.BatchNo,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ TaskType = TaskTypeEnum.ChenckIn.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ LocationCode = inventoryInfo.LocationCode,
+ OrderNo = order.order_no,
+ StockQuantity = Math.Abs(inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity),
+ SupplyQuantity = 0,
+ Remark = "鐩樼泩鍏ュ簱"
+ };
+ _supplyTaskHtyService.AddData(supplyTask_Hty);
+ }
+ #endregion
+ inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
+ inventoryInfo.SupplyQuantity = 0;
+ inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;
+ inventory_Batch.SupplyQuantity = 0;
+ _inventoryInfoService.UpdateData(inventoryInfos);
+ _inventory_BatchServices.UpdateData(inventory_Batch);
+ }
+ #endregion
+
+ #region 鍒涘缓鐩樼偣鍗�
+ var entityOrder = new Dt_CabinOrder
+ {
+ Order_no = order.order_no,
+ Order_type = order.order_type,
+ Supplier_no = order.supplier_no,
+ Account_tiem = order.account_time,
+ OdrderStatus = "宸插畬鎴�",
+ Supplier_name = order.supplier_name,
+ Warehouse_no = order.warehouse_no,
+ Details = order.details.Select(d => new Dt_CabinOrderDetail
+ {
+ Goods_no = d.goods_no,
+ Order_qty = Math.Abs(d.order_qty),
+ Order_Inqty = Math.Abs(d.order_qty),
+ Batch_num = d.batch_num,
+ Exp_date = d.exp_date,
+ Reservoirarea = order.warehouse_no,
+ OrderDetailStatus = "宸插畬鎴�",
+ Status = 2,
}).ToList()
};
-
- var url = "http://172.16.1.2:9357/file-admin/api/in/ediIn";
- var result = HttpHelper.Post(url, ediDto.ToJsonString());
- var resp = JsonConvert.DeserializeObject<TowcsResponse<object>>(result);
-
- if (resp != null && resp.code == "0")
- {
- // 鏇存柊琛ㄥご鐘舵��
- BaseDal.Db.Updateable<Dt_CabinOrder>()
- .SetColumns(o => new Dt_CabinOrder { OdrderStatus = "寮�濮�" })
- .Where(o => o.Id == order.Id)
- .ExecuteCommand();
-
- // 鏇存柊鏄庣粏鐘舵�佷负宸插悓姝�
- BaseDal.Db.Updateable<Dt_CabinOrderDetail>()
- .SetColumns(d => new Dt_CabinOrderDetail { Status = 1, OrderDetailStatus = "宸插畬鎴�" })
- .Where(d => d.OrderId == order.Id && d.Status == 0)
- .ExecuteCommand();
-
- Console.WriteLine($"璁㈠崟 {order.Order_no} 鎺ㄩ�佹垚鍔�");
- }
- else
- {
- SendErrorToUpstream(3, order.Order_no, resp?.msg ?? "WCS 鎺ㄩ�佸け璐�", "");
- Console.WriteLine($"璁㈠崟 {order.Order_no} 鎺ㄩ�佸け璐ワ細{resp?.msg}");
- return new WebResponseContent { Status = false, Message = "璁㈠崟鎺ㄩ�佸け璐�" };
- }
+ Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+ //Repository.AddData(entityOrder);
+ #endregion
}
- return new WebResponseContent { Status = true, Message = "鎺ㄩ�佹垚鍔�" };
- }
- catch (Exception ex)
- {
-
- Console.WriteLine("EdiIn 寮傚父锛�" + ex.Message);
- return new WebResponseContent { Status = false, Message = ex.Message };
- }
- }
-
-
- /// <summary>
- /// 鍏ュ簱鎶ュ畬鎴愭帴鍙�
- /// </summary>
- /// <param name="order_no">鍏ュ簱鍗曞彿</param> //鍏堟鏌ユ槸鍚︽墍鏈夋槑缁嗛兘宸插畬鎴愶紝濡傛灉鏄紝閭ｄ箞鏇存柊琛ㄥご鐘舵�佷负宸插畬鎴�
- /// <returns></returns>
- public WebResponseContent CompleteAllOrders()
- {
- var responseContent = new WebResponseContent();
- try
- {
- // 鏌ユ壘鎵�鏈夆�滃紑濮嬧�濈姸鎬佺殑鍏ュ簱鍗�
- var orders = BaseDal.Db.Queryable<Dt_CabinOrder>()
- .Where(o => o.OdrderStatus == "寮�濮�")
- .ToList();
-
- if (orders == null || !orders.Any())
+ #endregion
+ else
{
- return responseContent.OK("鏆傛棤闇�瑕佸鐞嗙殑鍏ュ簱鍗�");
- }
+ string WareCodeLK = WarehouseEnum.绔嬪簱.ObjToInt().ToString("000");
+ string WareCodeDJ = WarehouseEnum.澶т欢搴�.ObjToInt().ToString("000");
- int successCount = 0;
- int failCount = 0;
-
- foreach (var order in orders)
- {
- try
+ foreach (var item in order.details)
{
- BaseDal.Db.Ado.BeginTran();
-
- // 鏌ヨ璇ュ崟鐨勬槑缁�
- var details = BaseDal.Db.Queryable<Dt_CabinOrderDetail>()
- .Where(d => d.OrderId == order.Id)
- .ToList();
-
- // 鍒ゆ柇鏄惁鍏ㄩ儴瀹屾垚
- var totalCount = details.Count;
- var completedCount = details.Count(d => d.OrderDetailStatus == "宸插畬鎴�");
-
- if (totalCount > 0 && completedCount == totalCount)
+ //鎵惧簱瀛樻壒娆′俊鎭�
+ Dt_Inventory_Batch inventory_Batch = _inventory_BatchServices.Repository.QueryFirst(x => x.MaterielCode == item.goods_no && x.BatchNo == item.batch_num);
+ var Qty = Math.Abs(inventory_Batch.StockQuantity - inventory_Batch.SupplyQuantity);
+ if (Qty != item.order_qty) throw new Exception($"鐩樼泩鍏ュ簱鍗曘�恵order.order_no}銆戠墿鏂欑紪鍙枫�恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戠殑鐩樼泩鏁伴噺鏈夎");
+ //鎵炬墍鏈夊簱瀛�
+ List<Dt_InventoryInfo> inventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == inventory_Batch.MaterielCode && x.BatchNo == inventory_Batch.BatchNo);
+ //鑾峰彇绔嬪簱鐩樼偣宸紓鏁�
+ var inventoryLK = inventoryInfos.Where(x => x.WarehouseCode == WareCodeLK).First();
+ var LkQty = Math.Abs(inventoryLK.StockQuantity - inventoryLK.SupplyQuantity);
+ //鑾峰彇澶т欢搴撶洏鐐瑰樊寮傛暟
+ var inventoryDJ = inventoryInfos.Where(x => x.WarehouseCode == WareCodeDJ).ToList();
+ var DJQty = Math.Abs(inventoryDJ.Sum(x => x.StockQuantity) - inventoryDJ.Sum(x => x.SupplyQuantity));
+ if (LkQty + DJQty != Qty) throw new Exception($"銆恵order.order_no}銆戠墿鏂欑紪鍙枫�恵item.goods_no}銆戠墿鏂欐壒娆°�恵item.batch_num}銆戠殑鐗╂枡淇℃伅涓庣墿鏂欐壒娆′俊鎭洏鐩堟暟閲忎笉绗�");
+ if (LkQty == 0)//绔嬪簱鏃犲樊寮�
{
- // 鏇存柊琛ㄥご鐘舵��
- order.OdrderStatus = "宸插畬鎴�";
- BaseDal.Db.Updateable(order).ExecuteCommand();
-
- // 璋冪敤涓婃父鎺ュ彛
- var url = "http://121.37.118.63:80/GYZ2/95fck/inOrderOk";
- var result = HttpHelper.Post(url, new { order_no = order.Order_no }.ToJsonString());
- var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
-
- if (response.resultCode == "0")
+ #region 搴撳瓨銆佸簱瀛樻壒娆″钩璐�
+ foreach (var inventoryInfo in inventoryInfos)
{
- // === 姝ラ 1锛氭彃鍏ュ巻鍙茶〃 ===
-
- // 1.1 鎻掑叆琛ㄥご鍘嗗彶
- var orderHistory = new Dt_CabinOrder_Hty
+ #region 娣诲姞鐩樼泩鍏ュ簱浠诲姟
+ if (inventoryInfo.StockQuantity != inventoryInfo.SupplyQuantity)
{
- Id = order.Id,
- Order_no = order.Order_no,
- Order_type = order.Order_type,
- Supplier_no = order.Supplier_no,
- Supplier_name = order.Supplier_name,
- Account_tiem = order.Account_tiem,
- Warehouse_no = order.Warehouse_no,
- OdrderStatus = order.OdrderStatus,
-
- };
- var historyId = BaseDal.Db.Insertable(orderHistory).ExecuteReturnIdentity();
-
- // 1.2 鎻掑叆鏄庣粏鍘嗗彶
- var detailsHistory = details.Select(d => new Dt_CabinOrderDetail_Hty
- {
- Id = d.Id,
- Reservoirarea = d.Reservoirarea,
- Goods_no = d.Goods_no,
- Order_qty = d.Order_qty,
- Order_Inqty = d.Order_Inqty,
- Batch_num = d.Batch_num,
- Exp_date = d.Exp_date,
- OrderDetailStatus = d.OrderDetailStatus,
- Status = d.Status,
-
- }).ToList();
-
- BaseDal.Db.Insertable(detailsHistory).ExecuteCommand();
-
- // === 姝ラ 2锛氬垹闄ゅ師濮嬭〃 ===
- BaseDal.Db.Deleteable<Dt_CabinOrderDetail>().Where(d => d.OrderId == order.Id).ExecuteCommand();
- BaseDal.Db.Deleteable<Dt_CabinOrder>().Where(o => o.Id == order.Id).ExecuteCommand();
-
- // 鎻愪氦浜嬪姟
- BaseDal.Db.Ado.CommitTran();
- successCount++;
+ Dt_SupplyTask_Hty supplyTask_Hty = new Dt_SupplyTask_Hty()
+ {
+ WarehouseCode = inventoryInfo.WarehouseCode,
+ OperateType = OperateTypeEnum.鑷姩瀹屾垚.ToString(),
+ InsertTime = DateTime.Now,
+ TaskStatus = SupplyStatusEnum.InFinish.ObjToInt(),
+ BatchNo = inventoryInfo.BatchNo,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ TaskType = TaskTypeEnum.ChenckIn.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ LocationCode = inventoryInfo.LocationCode,
+ OrderNo = order.order_no,
+ StockQuantity = Math.Abs(inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity),
+ SupplyQuantity = 0,
+ Remark = "鐩樼泩鍏ュ簱"
+ };
+ _supplyTaskHtyService.AddData(supplyTask_Hty);
+ }
+ #endregion
+ inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
+ inventoryInfo.SupplyQuantity = 0;
+ inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
}
- else
+ _inventoryInfoService.UpdateData(inventoryInfos);
+ inventory_Batch.StockQuantity = inventory_Batch.SupplyQuantity;
+ inventory_Batch.SupplyQuantity = 0;
+ _inventory_BatchServices.UpdateData(inventory_Batch);
+ #endregion
+
+ #region 鍒涘缓澶т欢搴撶洏鐐瑰崟
+ var entityOrder = new Dt_CabinOrder
{
- BaseDal.Db.Ado.RollbackTran();
- failCount++;
- SendErrorToUpstream(2, "", $"涓婃父鎺ュ彛杩斿洖澶辫触: {response.resultMsg}", order.Order_no);
- }
+ Order_no = order.order_no,
+ Order_type = order.order_type,
+ Supplier_no = order.supplier_no,
+ Account_tiem = order.account_time,
+ OdrderStatus = "宸插畬鎴�",
+ Supplier_name = order.supplier_name,
+ Warehouse_no = WareCodeDJ,
+ Details = order.details.Select(d => new Dt_CabinOrderDetail
+ {
+ Goods_no = d.goods_no,
+ Order_qty = Math.Abs(d.order_qty),
+ Order_Inqty = Math.Abs(d.order_qty),
+ Batch_num = d.batch_num,
+ Exp_date = d.exp_date,
+ Reservoirarea = WareCodeDJ,
+ OrderDetailStatus = "宸插畬鎴�",
+ Status = 2,
+ }).ToList()
+ };
+ //Repository.AddData(entityOrder);
+ Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+
+ #endregion
}
else
{
- BaseDal.Db.Ado.RollbackTran();
+ #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.InFinish.ObjToInt(),
+ BatchNo = inventoryInfo.BatchNo,
+ MaterielName = inventoryInfo.MaterielName,
+ MaterielCode = inventoryInfo.MaterielCode,
+ MaterielSpec = inventoryInfo.MaterielSpec,
+ TaskType = TaskTypeEnum.ChenckIn.ObjToInt(),
+ CreateDate = DateTime.Now,
+ Creater = App.User.UserName,
+ LocationCode = inventoryInfo.LocationCode,
+ OrderNo = order.order_no,
+ StockQuantity = Math.Abs(inventoryInfo.StockQuantity - inventoryInfo.SupplyQuantity),
+ SupplyQuantity = 0,
+ Remark = "鐩樼泩鍏ュ簱"
+ };
+ _supplyTaskHtyService.AddData(supplyTask_Hty);
+ }
+ #endregion
+ inventoryInfo.StockQuantity = inventoryInfo.SupplyQuantity;
+ inventoryInfo.SupplyQuantity = 0;
+ inventoryInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ _inventoryInfoService.UpdateData(inventoryInfos);
+ #endregion
+
+ #region 鍒涘缓澶т欢搴撶洏鐐瑰崟
+ if (DJQty != 0)
+ {
+ var cabinOrder = new Dt_CabinOrder
+ {
+ Order_no = order.order_no,
+ Order_type = order.order_type,
+ Supplier_no = order.supplier_no,
+ Account_tiem = order.account_time,
+ OdrderStatus = "宸插畬鎴�",
+ Supplier_name = order.supplier_name,
+ Warehouse_no = WareCodeDJ,
+ Details = order.details.Select(d => new Dt_CabinOrderDetail
+ {
+ Goods_no = d.goods_no,
+ Order_qty = DJQty,
+ Order_Inqty = DJQty,
+ Batch_num = d.batch_num,
+ Exp_date = d.exp_date,
+ Reservoirarea = WareCodeDJ,
+ OrderDetailStatus = "宸插畬鎴�",
+ Status = 2,
+ }).ToList()
+ };
+ //Repository.AddData(cabinOrder);
+ Db.InsertNav(cabinOrder).Include(it => it.Details).ExecuteCommand();
+
+ }
+ #endregion
+
+ #region 鍒涘缓绔嬪簱鐩樼偣鍗�
+ var entityOrder = new Dt_CabinOrder
+ {
+ Order_no = order.order_no,
+ Order_type = order.order_type,
+ Supplier_no = order.supplier_no,
+ Account_tiem = order.account_time,
+ OdrderStatus = "鏂板缓",
+ Supplier_name = order.supplier_name,
+ Warehouse_no = WareCodeLK,
+ Details = order.details.Select(d => new Dt_CabinOrderDetail
+ {
+ Goods_no = d.goods_no,
+ Order_qty = LkQty,
+ Batch_num = d.batch_num,
+ Exp_date = d.exp_date,
+ Reservoirarea = WareCodeLK,
+ OrderDetailStatus = "鏂板缓",
+ Status = 0,
+ }).ToList()
+ };
+ //Repository.AddData(entityOrder);
+ Db.InsertNav(entityOrder).Include(it => it.Details).ExecuteCommand();
+ #endregion
}
}
- catch (Exception ex)
- {
- BaseDal.Db.Ado.RollbackTran();
- failCount++;
- SendErrorToUpstream(1, "", ex.Message, order.Order_no);
- }
}
-
- return responseContent.OK($"鎵归噺澶勭悊瀹屾垚锛氭垚鍔� {successCount} 鍗曪紝澶辫触 {failCount} 鍗曘��");
}
catch (Exception ex)
{
- return responseContent.Error("鎵归噺澶勭悊澶辫触锛�" + ex.Message);
+ //_messageInfoService.AddMessageInfo(MessageGroupByEnum.InOrderAlarm, "鍒涘缓鐩樼泩鍏ュ簱鍗�", ex.Message);
+ content.Error(ex.Message);
}
+ return content;
}
+ #endregion
-
-
-
-
- /// <summary>
- /// 鎺ㄩ�佸紓甯镐俊鎭粰涓婃父绯荤粺1.鍏ュ簱鍗曟帴鍙ｏ紱2.鍏ュ簱鍗曟姤瀹屾垚鎺ュ彛锛�3.鍑哄簱鍗曟帴鍙ｏ紱4.鍑哄簱鎶ュ畬鎴愭帴鍙ｏ紱5.鑽搧鍩虹淇℃伅鍚屾鎺ュ彛锛�6.渚涘簲鍟嗕俊鎭帴鍙ｏ紱7.瀹㈡埛淇℃伅鎺ュ彛锛�8.搴撳瓨
- /// </summary>
- public void SendErrorToUpstream(int type, string code, string message, string remark)
+ public WebResponseContent FinishInOrder(int key)
{
+ WebResponseContent content = new WebResponseContent();
try
{
- var url = "http://121.37.118.63:80/GYZ2/95fck/lexceptionLogog";
-
- var requestData = new
+ Dt_CabinOrder cabinOrder = BaseDal.QueryFirst(x => x.Id == key);
+ List<Dt_CabinOrder> cabinOrders = Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no).Includes(x => x.Details).ToList();//鎵惧嚭鎵�鏈夊嚭搴撳崟鍙风浉鍚岀殑鍑哄簱鍗�
+ _unitOfWorkManage.BeginTran();
+ foreach (var item in cabinOrders)
{
- type = type.ToString(),
- code = code,
- message = message,
- remark = remark
+ if (item.Details != null)
+ _cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.浜哄伐瀹屾垚);
+ item.Modifier = App.User.UserName;
+ item.ModifyDate = DateTime.Now;
+ item.Details = null;
+ }
+ BaseDal.DeleteAndMoveIntoHty(cabinOrders, OperateTypeEnum.浜哄伐瀹屾垚);
+ var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
+ var requestDate = new
+ {
+ order_no = cabinOrder.Order_no
};
-
- var result = HttpHelper.Post(url, requestData.ToJsonString());
- // 鍙互鍙嶅簭鍒楀寲妫�鏌� resultCode 鏄惁涓�0
+ var result = HttpHelper.Post(url, requestDate.ToJsonString());
+ var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
+ if (response == null) throw new Exception("涓婃姤ERP鍏ュ簱鍗曞畬鎴愬け璐ワ紒");
+ if (response.resultCode != "0") throw new Exception(response.resultMsg);
+ _unitOfWorkManage.CommitTran();
+ content.OK();
}
- catch (Exception e)
+ catch (Exception ex)
{
- // 杩欓噷涓嶈鍐嶆姏寮傚父浜嗭紝閬垮厤姝诲惊鐜�
- Console.WriteLine("寮傚父鎺ュ彛鎺ㄩ�佸け璐ワ細" + e.Message);
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
}
+ return content;
}
-
-
-
-
-
-
}
}
--
Gitblit v1.9.3