From 3713a17fe36d877ce3e588c1dc08526fc8afffdc Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 23 十月 2025 09:26:31 +0800
Subject: [PATCH] 111
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/CabinOrderServices.cs | 827 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 668 insertions(+), 159 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 d4560c4..e8caa77 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,6 @@
锘縰sing HslCommunication;
using MailKit.Search;
+using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using SqlSugar;
using System;
@@ -7,12 +8,19 @@
using System.Linq;
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_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
-
+using WIDESEA_IBasicService;
using WIDESEA_ISquareCabinServices;
+using WIDESEA_IWMsInfoServices;
using WIDESEA_Model.Models;
using static System.Net.WebRequestMethods;
@@ -24,113 +32,265 @@
{
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;
+ public IRepository<Dt_CabinOrder> Repository => BaseDal;
- public CabinOrderServices(IRepository<Dt_CabinOrder> BaseDal) : 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) : base(BaseDal)
{
+ _basicService = basicService;
+ _medicineGoodsServices = medicineGoodsServices;
+ _unitOfWorkManage = unitOfWorkManage;
+ _inventory_BatchServices = inventory_BatchServices;
+ _inventoryInfoService = inventoryInfoService;
+ _cabinOrderDetailServices = cabinOrderDetailServices;
+ _supplyTaskService = supplyTaskService;
}
+
+
+
+ /// <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="pageNo"></param>
+ /// <param name="orderNo"></param>
+ /// <returns></returns>
+ public WebResponseContent GetCabinOrderDetail(int pageNo, string orderNo)
+ {
+ 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).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 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_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) return WebResponseContent.Instance.Error($"鍏ュ簱鍗曞凡瀹屾垚");
+ //Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == batchNo && x.Reservoirarea == warehouseCode).First();
+ Dt_CabinOrderDetail cabinOrderDetail = cabinOrder.Details.Where(x => x.Batch_num == batchNo && x.Status == 2).First();
+ if (cabinOrderDetail == null) return WebResponseContent.Instance.Error($"鍏ュ簱鍗曟槑缁嗗凡瀹屾垚");
+ Dt_MaterielInfo materielInfo = _basicService.MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == cabinOrderDetail.Goods_no);
+ if (materielInfo == null) return WebResponseContent.Instance.Error($"璇风淮鎶ょ墿鏂欑紪鍙枫�恵cabinOrderDetail.Goods_no}銆戠殑鐗╂枡淇℃伅");
+ cabinOrderDetail.Order_Inqty += Inqty;
+ if (cabinOrderDetail.Order_Inqty > cabinOrderDetail.Order_qty)
+ return WebResponseContent.Instance.Error($"鍏ュ簱鏁伴噺涓嶅彲瓒呭嚭鍗曟嵁鏁伴噺");
+
+ #region 澶勭悊鍏ュ簱鍗曪紝璐т綅锛屽簱瀛橈紝搴撳瓨鎵规淇℃伅
+ _unitOfWorkManage.BeginTran();
+
+ #region 鍏ュ簱鍗�
+ cabinOrder.OdrderStatus = "寮�濮�";
+ cabinOrderDetail.OrderDetailStatus = "寮�濮�";
+ if (cabinOrderDetail.Order_Inqty == cabinOrderDetail.Order_qty)
+ {
+ cabinOrderDetail.OrderDetailStatus = "宸插畬鎴�";
+ //_cabinOrderDetailServices.Repository.DeleteAndMoveIntoHty(cabinOrderDetail, OperateTypeEnum.鑷姩瀹屾垚);
+
+ Dt_CabinOrderDetail_Hty hty = new Dt_CabinOrderDetail_Hty
+ {
+ Id = cabinOrderDetail.OrderId,
+ Reservoirarea = cabinOrderDetail.Reservoirarea,
+ Goods_no = cabinOrderDetail.Goods_no,
+ Order_qty = cabinOrderDetail.Order_qty,
+ Order_Inqty = cabinOrderDetail.Order_Inqty,
+ Batch_num = cabinOrderDetail.Batch_num,
+ Exp_date = cabinOrderDetail.Exp_date,
+ OrderDetailStatus = cabinOrderDetail.OrderDetailStatus,
+ Status = cabinOrderDetail.Status,
+ Creater = cabinOrderDetail.Creater,
+ CreateDate = cabinOrderDetail.CreateDate,
+ Modifier = App.User.UserName,
+ ModifyDate = DateTime.Now
+ };
+ var i = BaseDal.Db.Insertable(hty).ExecuteCommand();
+ if (i<0)
+ {
+ _unitOfWorkManage.RollbackTran();
+ }
+ var v = BaseDal.Db.Deleteable<Dt_CabinOrderDetail>(cabinOrderDetail).ExecuteCommand();
+ if (v < 0)
+ {
+ _unitOfWorkManage.RollbackTran();
+ }
+ }
+ else
+ {
+ _cabinOrderDetailServices.Repository.UpdateData(cabinOrderDetail);
+ }
+ var cabinOrder1 = BaseDal.Db.Queryable<Dt_CabinOrder>().Where(x => x.Order_no == cabinOrder.Order_no).Includes(x => x.Details).First();
+ if (cabinOrder1.Details == null || cabinOrder1.Details.Count < 1) cabinOrder.OdrderStatus = "宸插畬鎴�";
+ Repository.UpdateData(cabinOrder);
+ #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}銆戝凡绂佺敤锛岃鎭㈠姝ｅ父鍐嶄娇鐢�");
+ if (location.LocationStatus != LocationStatusEnum.InStock.ObjToInt())
+ {
+ location.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+ _basicService.LocationInfoService.UpdateData(location);
+ }
+ #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)
+ {
+ inventoryInfo.StockQuantity += Inqty;
+ _inventoryInfoService.UpdateData(inventoryInfo);
+ }
+ else
+ {
+ inventoryInfo = new Dt_InventoryInfo()
+ {
+ LocationCode = LocationCode,
+ MaterielCode = materielInfo.MaterielCode,
+ MaterielName = materielInfo.MaterielName,
+ MaterielSpec = materielInfo.MaterielSpec,
+ OutboundQuantity = 0,
+ StockQuantity = 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 浠诲姟璁板綍
+ 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
+
+ #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_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,
+ 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;
+ }
+
+
+
/// <summary>
/// 鑾峰彇涓婃父绯荤粺鐨勫叆搴撳崟
/// </summary>
/// <param name="searchDate"></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()
{
var responseContent = new WebResponseContent();
@@ -138,14 +298,16 @@
{
// 璇锋眰鍦板潃
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 url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363009261";
+
+ if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//// 璇锋眰鍙傛暟
var requestData = new
{
- //searchDate = SearchDate
- searchDate = "2022-10-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
+ searchDate = SearchDate
+ //searchDate = "2022-10-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
};
- //SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
+ SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
// 鍙戣捣璇锋眰
var result = HttpHelper.Post(url, requestData.ToJsonString());
@@ -187,36 +349,188 @@
foreach (var order in newOrders)
{
- var entityOrder = new Dt_CabinOrder
+ if (order.order_type == "1") //姝ｅ父鍏ュ簱
{
- 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
+
+ }
+ else
+ {
+ //鍒涘缓鍑哄簱鍗�
+ }
+ #region 鍒涘缓涓�涓叆搴撳崟鏂规硶
+ //鎺掗櫎鐗规畩鑽搧
+ bool skipOrder = false;//鏍囪鏄惁璺宠繃璇ュ叆搴撳崟
+ if (order.warehouse_no != "001" && (order.warehouse_no == "010" || order.warehouse_no == "003" || order.warehouse_no == "017"))//鐗规畩鑽搧搴撴埧鍙疯繘琛屼笅闈㈡搷浣�
+ {
+ //鍒涘缓鍏ュ簱鍗曚富琛ㄤ粠琛�
+ var entityOrder = new Dt_CabinOrder
{
- //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()
- };
- _CabinOrders.Add(entityOrder);
- orderNos.Add(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 = order.warehouse_no,
+ 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 = 2, //濡傛灉鏄�001鎴块偅涔堝氨鏄湭鍚屾鐘舵�侊紝濡傛灉涓嶆槸001鎴块偅涔堝氨鏄棤闇�鍚屾鐘舵��
+ }).ToList()
+ };
+ _CabinOrders.Add(entityOrder);
+ }
+ 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 = order.warehouse_no,
+ 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)
+ {
+ skipOrder = true;
+ Console.WriteLine($"璺宠繃鍏ュ簱鍗� {order.order_no}锛屽師鍥狅細鏈壘鍒板晢鍝� [{item.goods_no}] 鐨勭墿鏂欎俊鎭��");
+ break;
+ }
+
+ // 鑻ョ墿鏂欎笉瀛樺湪鎴� MaterielSourceType 涓虹┖锛屽垯璺宠繃鏁翠釜鍏ュ簱鍗�
+ if (materielInfo == null || !Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
+ {
+ skipOrder = true;
+ break;
+ }
+ //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()
+ {
+ Reservoirarea = order.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);
+ }
+ else
+ {
+ Dt_CabinOrderDetail orderDetail = null;
+ var ys = item.order_qty % materielInfo.BoxQty; //涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
+ //var xs = item.order_qty / materielInfo.BoxQty;//鏁寸鏁伴噺
+ var xs = (int)(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) //褰撲笟鍔℃暟閲忓拰鏁寸鏁伴兘澶т簬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;
+ }
+ }
+
+ if (orderDetail != null) entityOrder.Details.Add(orderDetail);
+ #endregion
+
+
+ #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
+ }
+ #endregion
+ // 鉂楀鏋滆烦杩囪鍗曪紝鍒欑洿鎺ontinue锛屼笉淇濆瓨
+ if (skipOrder)
+ {
+ Console.WriteLine($"璺宠繃鍏ュ簱鍗� {order.order_no}锛屽洜涓哄瓨鍦ㄦ湭瀹氫箟鐗╂枡灞炴�х殑鍟嗗搧銆�");
+ continue;
+ }
+ _CabinOrders.Add(entityOrder);
+ orderNos.Add(order.order_no);
+ }
};
BaseDal.Db.InsertNav(_CabinOrders).Include(x => x.Details).ExecuteCommand();
//鍦ㄤ笅鍙戠粰wcs
- //var reslut= EdiIn(); //鍙戠粰涓嬫父
- //濡傛灉杩欎釜鏂规硶鎴愬姛浜嗭紝閭ｄ箞灏辫皟鐢–ompleteOrder鎺ュ彛锛岀劧鍚庢敼鍙�
+ //EdiIn(); //鍙戠粰涓嬫父
+ //濡傛灉杩欎釜鏂规硶鎴愬姛浜嗭紝閭ｄ箞灏辫皟鐢–ompleteOrder鎺ュ彛锛岀劧鍚庢敼鍙�
Db.Ado.CommitTran();
return responseContent.OK("鍚屾鍏ュ簱鍗曟垚鍔�");
}
@@ -230,6 +544,214 @@
catch (Exception ex)
{
// 鍏ㄥ眬寮傚父鏃讹紝涔熸帹閫佸紓甯哥粰涓婃父
+ SendErrorToUpstream(1, "", ex.Message, "");
+ return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+ }
+ }
+
+ /// <summary>
+ /// 瀵规病鏈夎繘琛岀淮鎶ゅ晢鍝佷俊鎭〃鐨勫叆搴撳崟杩涜杩囨护澶勭悊
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent GetUpstreamOrder2()
+ {
+ var responseContent = 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 = "2020-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<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("鏃犳柊鍏ュ簱鍗曟暟鎹�");
+
+ var existingOrderNos = BaseDal.Db.Queryable<Dt_CabinOrder>()
+ .Select(x => x.Order_no)
+ .ToList();
+
+ var newOrders = response.data
+ .Where(order => !existingOrderNos.Contains(order.order_no))
+ .ToList();
+
+ if (!newOrders.Any())
+ return responseContent.OK("鎵�鏈夊叆搴撳崟宸插瓨鍦紝鏃犻渶鏂板");
+
+ Db.Ado.BeginTran();
+ try
+ {
+ List<Dt_CabinOrder> _CabinOrders = new();
+ List<string> orderNos = new();
+
+ foreach (var order in newOrders)
+ {
+ bool skipOrder = false; // 鏍囪鏄惁璺宠繃璇ュ叆搴撳崟
+ 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 = new List<Dt_CabinOrderDetail>()
+ };
+
+ foreach (var item in order.details)
+ {
+ item.order_qty = Math.Abs(item.order_qty);
+
+ // 鏌ヨ鐗╂枡淇℃伅
+ var materielInfo = BaseDal.Db.Queryable<Dt_MedicineGoods>()
+ .Where(x => x.Goods_no == item.goods_no)
+ .First();
+
+
+ //濡傛灉鐗╂枡淇℃伅涓嶅瓨鍦紝璺宠繃鏁翠釜鍏ュ簱鍗�
+ if (materielInfo == null)
+ {
+ skipOrder = true;
+ Console.WriteLine($"璺宠繃鍏ュ簱鍗� {order.order_no}锛屽師鍥狅細鏈壘鍒板晢鍝� [{item.goods_no}] 鐨勭墿鏂欎俊鎭��");
+ break;
+ }
+
+ // 鑻ョ墿鏂欎笉瀛樺湪鎴� MaterielSourceType 涓虹┖锛屽垯璺宠繃鏁翠釜鍏ュ簱鍗�
+ if (materielInfo == null || !Enum.IsDefined(typeof(MaterielSourceTypeEnum), materielInfo.MaterielSourceType))
+ {
+ skipOrder = true;
+ break;
+ }
+
+ // 鍖哄垎澶т欢/灏忎欢
+ if (materielInfo.MaterielSourceType == MaterielSourceTypeEnum.PurchasePart)
+ {
+ var detail = new Dt_CabinOrderDetail
+ {
+ Reservoirarea = order.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(detail);
+ }
+ else
+ {
+ Dt_CabinOrderDetail orderDetail = null;
+ var ys = item.order_qty % materielInfo.BoxQty; // 涓嶈兘鏁撮櫎鐨勬暎浠�
+ var xs = item.order_qty / materielInfo.BoxQty; // 鏁寸鏁伴噺
+
+ // 鏈夋暎浠�
+ 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;
+ }
+
+ // 涓嶈冻鏈�浣庡簱瀛樻椂琛ュ叆绔嬪簱
+ 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
+ };
+ }
+ else
+ {
+ orderDetail.Order_qty += materielInfo.BoxQty;
+ }
+ materielInfo.Business_qty += materielInfo.BoxQty;
+ }
+
+ if (orderDetail != null) entityOrder.Details.Add(orderDetail);
+
+ // 鍓╀綑鏁寸鍏ュ钩搴�
+ if (xs > 0)
+ {
+ entityOrder.Details.Add(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
+ });
+ }
+ }
+
+ _medicineGoodsServices.Db.Updateable(materielInfo).ExecuteCommand();
+ }
+
+ // 鉂楀鏋滆烦杩囪鍗曪紝鍒欑洿鎺ontinue锛屼笉淇濆瓨
+ if (skipOrder)
+ {
+ Console.WriteLine($"璺宠繃鍏ュ簱鍗� {order.order_no}锛屽洜涓哄瓨鍦ㄦ湭瀹氫箟鐗╂枡灞炴�х殑鍟嗗搧銆�");
+ continue;
+ }
+
+ _CabinOrders.Add(entityOrder);
+ orderNos.Add(order.order_no);
+ }
+
+ if (_CabinOrders.Any())
+ {
+ BaseDal.Db.InsertNav(_CabinOrders).Include(x => x.Details).ExecuteCommand();
+ Db.Ado.CommitTran();
+ return responseContent.OK($"鎴愬姛鍚屾 {_CabinOrders.Count} 鏉″叆搴撳崟");
+ }
+ else
+ {
+ Db.Ado.RollbackTran();
+ return responseContent.OK("鏃犲彲澶勭悊鐨勫叆搴撳崟锛堝晢鍝佸睘鎬ф湭瀹氫箟鎴栨湭鎵惧埌锛�");
+ }
+ }
+ catch (Exception ex)
+ {
+ Db.Ado.RollbackTran();
+ SendErrorToUpstream(1, "", ex.Message, "");
+ return responseContent.Error("鍚屾澶辫触: " + ex.Message);
+ }
+ }
+ catch (Exception ex)
+ {
SendErrorToUpstream(1, "", ex.Message, "");
return responseContent.Error("鍚屾澶辫触: " + ex.Message);
}
@@ -256,27 +778,25 @@
// 3. 鍐嶈繃婊ゆ帀涓嶇鍚堟潯浠剁殑鏄庣粏锛堝彧淇濈暀 Status=0锛�
foreach (var order in orders)
{
+ Console.WriteLine($"璁㈠崟 {order.Order_no} 鍘熸槑缁嗘暟锛歿order.Details.Count}");
order.Details = order.Details.Where(d => d.Status == 0).ToList();
+ Console.WriteLine($"璁㈠崟 {order.Order_no} 杩囨护鍚庢槑缁嗘暟锛歿order.Details.Count}");
}
+
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))
- {
- //濡傛灉鏉′欢婊¤冻锛屽皢鐗╂枡浠ｇ爜璁剧疆涓虹涓�涓槑缁嗛」瀵瑰簲鐨勮嵂鍝佺墿鏂欎唬鐮�
- materialCode = firstDetail.MedicineGoods.MaterialCode;
- }
+ // 浠庣涓�涓湁 MedicineGoods 鐨勬槑缁嗕腑鍙栧嚭 MaterielErpType
+ string materialCode = order.Details
+ .Select(d => d.MedicineGoods?.MaterielErpType)
+ .FirstOrDefault(x => !string.IsNullOrEmpty(x)) ?? "YY"; // 榛樿鍊糦Y
var ediDto = new ToediInInfo
{
@@ -300,9 +820,9 @@
//浜у搧
productCode = d.Goods_no,
//sku鍚嶇О
- productName = d.MedicineGoods?.Goods_spm,
+ productName = d.MedicineGoods?.MaterielName,
//sku瑙勬牸
- productSpecifications = d.MedicineGoods?.Model,
+ productSpecifications = d.MedicineGoods?.MaterielSpec,
//鏁伴噺
quantity = (int)d.Order_qty,
//鏁堟湡
@@ -311,36 +831,25 @@
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()
- // }
- // }
}).ToList()
};
var url = "http://172.16.1.2:9357/file-admin/api/in/ediIn";
+ //var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363019549";
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_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 = "宸插畬鎴�" })
+ .SetColumns(d => new Dt_CabinOrderDetail { Status = 1, OrderDetailStatus = "寮�濮�" })
.Where(d => d.OrderId == order.Id && d.Status == 0)
.ExecuteCommand();
@@ -357,7 +866,7 @@
}
catch (Exception ex)
{
-
+
Console.WriteLine("EdiIn 寮傚父锛�" + ex.Message);
return new WebResponseContent { Status = false, Message = ex.Message };
}
@@ -444,7 +953,7 @@
Exp_date = d.Exp_date,
OrderDetailStatus = d.OrderDetailStatus,
Status = d.Status,
-
+
}).ToList();
BaseDal.Db.Insertable(detailsHistory).ExecuteCommand();
@@ -486,7 +995,7 @@
}
-
+
/// <summary>
@@ -518,7 +1027,7 @@
-
+
}
--
Gitblit v1.9.3