From 521fdf6c46213cad7c5c55015401154db0e78848 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 24 十月 2025 13:17:43 +0800
Subject: [PATCH] 优化出入库历史单据头表从表查询
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 427 ++++++++++++++++++++--------------------------------
1 files changed, 167 insertions(+), 260 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 e3bf0e9..17c4d11 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"
@@ -3,6 +3,8 @@
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;
@@ -11,7 +13,9 @@
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;
@@ -38,8 +42,9 @@
private readonly IDeliveryOrderDetailServices _deliveryOrderDetailServices;
private readonly ISupplyTaskService _supplyTaskService;
private readonly ICabinOrderServices _cabinOrderServices;
+ private readonly ITacticsService _tacticsService;
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, IBasicService basicService, IUnitOfWorkManage unitOfWorkManage, IInventory_BatchServices inventory_BatchServices, IInventoryInfoService inventoryInfoService, IDeliveryOrderDetailServices deliveryOrderDetailServices, ISupplyTaskService supplyTaskService, ICabinOrderServices cabinOrderServices, ITacticsService tacticsService) : base(BaseDal)
{
_basicService = basicService;
_unitOfWorkManage = unitOfWorkManage;
@@ -48,24 +53,23 @@
_inventory_BatchServices = inventory_BatchServices;
_inventoryInfoService = inventoryInfoService;
_cabinOrderServices = cabinOrderServices;
+ _tacticsService = tacticsService;
}
-
- /// <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";
- var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
+ var url = "http://121.37.118.63:80/GYZ2/95fck/outOrder";
+ //var url = "http://127.0.0.1:4523/m1/5660322-5340849-default/GYZ2/95fck/outOrder";
+ if (string.IsNullOrEmpty(SearchDate)) SearchDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ //// 璇锋眰鍙傛暟
var requestData = new
{
- searchDate = "2022-10-10 20:45:16"
+ searchDate = SearchDate
+ //searchDate = "2022-10-10 20:45:16" // 姝ｇ‘鐨勬牸寮�
};
+ SearchDate = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd HH:mm:ss");
var result = HttpHelper.Post(url, requestData.ToJsonString());
var response = JsonConvert.DeserializeObject<UpstreamResponse<UpstramOutOrderInfo>>(result);
@@ -117,8 +121,9 @@
}
else if (outorder.order_type == "1") // 姝ｅ父鍑哄簱鍗�
{
+ CreateOutboundOrder(outorder);//鍒涘缓鍑哄簱鍗曘�佸鐞嗗簱瀛樸�佹坊鍔犲嚭搴撲换鍔�
// 鎺掗櫎鐗规畩鑽搧,鐗规畩鑽搧鐩存帴鎻掑叆
- if (outorder.warehouse_no != "001" && outorder.warehouse_no != "澶т欢骞冲簱")
+ if (outorder.warehouse_no != "001" && (outorder.warehouse_no == "010" || outorder.warehouse_no == "003" || outorder.warehouse_no == "017"))
{
var entityOrder = new Dt_DeliveryOrder
{
@@ -202,7 +207,7 @@
Dt_DeliveryOrderDetail orderDetail = null;
// 璁＄畻鏁寸鍜屾暎浠舵暟閲�
- var ys = orderQty % medication.BoxQty; // 涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
+ var ys = orderQty % medication.BoxQty; // 涓嶈兘鏁撮櫎绠辫鐨勬暎浠舵暟
var xs = (int)(orderQty / medication.BoxQty); // 鏁寸鏁伴噺锛堜繚鐣欐暣鏁帮級
#region 浠庣珛搴撳嚭搴撴暎浠�
@@ -221,20 +226,6 @@
Status = 0 // 绔嬪簱锛岄渶瑕佸悓姝ョ粰WCS
};
medication.Business_qty -= ys;
- }
- else
- {
- // 绔嬪簱搴撳瓨涓嶈冻锛屾暎浠朵篃浠庡钩搴撳嚭
- orderDetail = new Dt_DeliveryOrderDetail()
- {
- Reservoirarea = outorder.warehouse_no,
- Goods_no = item.goods_no,
- Order_qty = ys,
- Batch_num = item.batch_num,
- Exp_date = item.exp_date,
- OotDetailStatus = "鏂板缓",
- Status = 2 // 骞冲簱
- };
}
#endregion
@@ -314,9 +305,11 @@
{
BaseDal.Db.InsertNav(_DeliveryOrders).Include(x => x.Details).ExecuteCommand();
}
+ //涓嬪彂鍑哄簱鍗曚换鍔＄粰wcs
+
Db.Ado.CommitTran();
- var tex= CreateSupplyTask(order_no);
+ var tex = CreateSupplyTask(order_no);
if (!tex)
{
return responseContent.Error("鍒涘缓渚涘簲浠诲姟澶辫触");
@@ -336,55 +329,80 @@
return responseContent.Error("鍚屾澶辫触: " + ex.Message);
}
}
-
-
/// <summary>
- /// 鍒涘缓渚涘簲浠诲姟
+ /// 鍒涘缓鍑哄簱鍗�
/// </summary>
- /// <param name="outorder">鍑哄簱鍗曚俊鎭�</param>
- /// <param name="item">鍑哄簱鏄庣粏椤�</param>
- /// <param name="medication">鐗╂枡淇℃伅</param>
- /// <param name="quantity">浠诲姟鏁伴噺</param>
- /// <param name="taskType">浠诲姟绫诲瀷锛�0锛氬嚭搴擄紝1锛氬叆搴擄紝2锛氱洏鐐圭瓑锛�</param>
- /// <param name="remark">澶囨敞</param>
- /// <returns>浠诲姟瀵硅薄</returns>
- //private bool CreateSupplyTask(List<string> order_no)
- //{
- // // 鍏堣幏鍙栫鍚堟潯浠剁殑涓昏〃ID
- // var mainOrderIds = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
- // .Where(x => order_no.Contains(x.Out_no))
- // .Select(x => x.Id)
- // .ToList();
+ /// <param name="outorder"></param>
+ /// <returns></returns>
+ public WebResponseContent CreateOutboundOrder(UpstramOutOrderInfo outorder)
+ {
+ WebResponseContent webResponseContent = new WebResponseContent();
+ try
+ {
+ Dt_Tactics tactics = _tacticsService.Repository.QueryFirst(x => x.TacticeName == "鍑哄簱绛栫暐");
+ if (outorder.warehouse_no == WarehouseEnum.楹荤簿搴�.ObjToInt().ToString("000") || outorder.warehouse_no == WarehouseEnum.鍐峰喕搴�.ObjToInt().ToString("000"))
+ {
+ #region 娣诲姞鍑哄簱鍗�
+ 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
+ {
+ 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()
+ };
+ BaseDal.Db.InsertNav(entityOrder).Include(x => x.Details).ExecuteCommand();
+ #endregion
+ List<Dt_InventoryInfo> dt_InventoryInfos = new List<Dt_InventoryInfo>();
+ #region 澶勭悊搴撳瓨銆佹坊鍔犲嚭搴撲换鍔�
+ foreach (var item in entityOrder.Details)
+ {
+ dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == item.Goods_no && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.StockQuantity > x.OutboundQuantity && x.WarehouseCode == item.Reservoirarea);
+ #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)
+ {
+ if (InventoryInfo.AvailableQuantity < Order_qty)
+ {
- // // 鐩存帴鏌ヨ瀛愯〃鏁版嵁
- // List<Dt_DeliveryOrderDetail> filteredDetails = BaseDal.Db.Queryable<Dt_DeliveryOrderDetail>()
- // .Where(d => mainOrderIds.Contains(d.DeliveryOrderId) && d.OotDetailStatus == "鏂板缓")
- // .ToList();
+ }
+ }
+ }
+ #endregion
+ }
+ else
+ {
- // foreach (var item in filteredDetails)
- // {
- // new Dt_SupplyTask
- // {
- // TaskNum = GetNextTaskNum(), // 闇�瑕佸疄鐜拌幏鍙栦笅涓�涓换鍔＄紪鍙风殑鏂规硶
- // PalletCode = null, // 鏍规嵁涓氬姟閫昏緫璁剧疆鎵樼洏缂栧彿
- // BatchNo = item.Batch_num,
- // MaterielCode = item.Goods_no,
- // MaterielName = medication?.MaterielName, // 浠庣墿鏂欎俊鎭幏鍙�
- // MaterielSpec = medication?.MaterielSpec, // 浠庣墿鏂欎俊鎭幏鍙�
- // TaskType = 0, // 0-鍑哄簱浠诲姟
- // TaskStatus = item.Status ==0 ? 0:1, // 0-鏂板缓
- // WarehouseCode = outorder.warehouse_no,
- // LocationCode = "绔嬪簱", // 绔嬪簱浠诲姟鐨勮揣浣嶇紪鍙峰浐瀹氫负"绔嬪簱"
- // StockQuantity = quantity,
- // SupplyQuantity = 0, // 鍒濆鐩樼偣鏁颁负0
- // OrderNo = outorder.order_no, // 鍏宠仈鍑哄簱鍗曞彿
- // Dispatchertime = DateTime.Now,
- // Remark = remark
- // };
- // }
-
- //}
-
+ }
+ }
+ catch (Exception ex)
+ {
+ webResponseContent.Error(ex.Message);
+ }
+ return webResponseContent;
+ }
+ /// <summary>
+ /// 鐢熸垚鍑哄簱鍗曚换鍔�
+ /// </summary>
+ /// <param name="order_no">鍑哄簱鍗曞彿</param>
+ /// <returns></returns>
private bool CreateSupplyTask(List<string> order_no)
{
try
@@ -423,6 +441,13 @@
if (mainOrder == null) continue;
+
+ var location = Db.Queryable<Dt_InventoryInfo>()
+ .Where(x => x.MaterielCode == ""//materielCode
+ && x.BatchNo == ""//batchNo
+ && x.StockQuantity > 0)
+ .OrderBy(x => x.InDate) // 鎸夊叆搴撴椂闂存帓搴�
+ .First();
var supplyTask = new Dt_SupplyTask
{
@@ -479,56 +504,6 @@
return randomNum;
}
- /// <summary>
- /// 鍒涘缓渚涘簲浠诲姟
- /// </summary>
- /// <param name="outorder">鍑哄簱鍗曚俊鎭�</param>
- /// <param name="item">鍑哄簱鏄庣粏椤�</param>
- /// <param name="medication">鐗╂枡淇℃伅</param>
- /// <param name="quantity">浠诲姟鏁伴噺</param>
- /// <param name="taskType">浠诲姟绫诲瀷锛�0锛氬嚭搴擄紝1锛氬叆搴擄紝2锛氱洏鐐圭瓑锛�</param>
- /// <param name="remark">澶囨敞</param>
- /// <returns>浠诲姟瀵硅薄</returns>
- //private Dt_SupplyTask CreateSupplyTask(UpstramOutOrderInfo outorder, dynamic item, Dt_MaterielInfo medication, decimal quantity, int taskType, string remark)
- //{
- // return new Dt_SupplyTask
- // {
- // TaskNum = GetNextTaskNum(), // 闇�瑕佸疄鐜拌幏鍙栦笅涓�涓换鍔＄紪鍙风殑鏂规硶
- // PalletCode = null, // 鏍规嵁涓氬姟閫昏緫璁剧疆鎵樼洏缂栧彿
- // BatchNo = item.batch_num,
- // MaterielCode = item.goods_no,
- // MaterielName = medication?.MaterielName, // 浠庣墿鏂欎俊鎭幏鍙�
- // MaterielSpec = medication?.MaterielSpec, // 浠庣墿鏂欎俊鎭幏鍙�
- // TaskType = taskType, // 0-鍑哄簱浠诲姟
- // TaskStatus = 0, // 0-鏂板缓
- // WarehouseCode = outorder.warehouse_no,
- // LocationCode = "绔嬪簱", // 绔嬪簱浠诲姟鐨勮揣浣嶇紪鍙峰浐瀹氫负"绔嬪簱"
- // StockQuantity = quantity,
- // SupplyQuantity = 0, // 鍒濆鐩樼偣鏁颁负0
- // OrderNo = outorder.order_no, // 鍏宠仈鍑哄簱鍗曞彿
- // Dispatchertime = DateTime.Now,
- // Remark = remark
- // };
- //}
-
-
-
-
- /// <summary>
- /// 鑾峰彇涓嬩竴涓换鍔＄紪鍙�
- /// </summary>
- /// <returns>浠诲姟缂栧彿</returns>
- private int GetNextTaskNum()
- {
- // 杩欓噷闇�瑕佹牴鎹偍鐨勫簭鍒楃敓鎴愰�昏緫鏉ュ疄鐜�
- // 鍋囪浣跨敤鏁版嵁搴撳簭鍒�
- return BaseDal.Db.Ado.GetInt("SELECT NEXT VALUE FOR SeqTaskNum");
- // 鎴栬�呭鏋滄槸鑷ID锛屽彲浠ユ彃鍏ュ悗鑾峰彇
- }
-
-
-
-
/// <summary>
/// 鍑哄簱鍗曟帹閫佺粰 WCS
@@ -541,7 +516,7 @@
{
// 1. 鏌ヨ绗﹀悎鏉′欢鐨勮鍗曪紙琛ㄥご=鏂板缓 && 鍖呭惈鏈夋晥鏄庣粏锛�
var outOrders = BaseDal.Db.CopyNew().Queryable<Dt_DeliveryOrder>()
- .Where(o => o.OutStatus == "鏂板缓")
+ .Where(o => o.OutStatus == "鏂板缓" && o.Warehouse_no == WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"))
.Includes(o => o.Details, d => d.MedicineGoods)
.ToList();
@@ -575,7 +550,7 @@
customerCode = "905",
materialCode = materialCode,
externalOrderNo = order.Out_no,
- outOrderType = order.Out_type == "1" ? "10" : order.Out_type == "2" ? "20" : "30",
+ outOrderType = order.Out_type == "1" ? "10" : order.Out_type == "3" ? "20" : "30",//鍑哄簱鍗曠被鍨嬫槸1灏辨槸姝ｅ父鐨勶紝3灏辨槸鐩樼偣
priority = 1,
Is_cancel = 0,
details = order.Details.Select(d => new TowcsDto.ToeOutdiInDetail
@@ -595,8 +570,8 @@
};
// 4. 璋冪敤鎺ュ彛
- //var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
- var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363076920";
+ var url = "http://172.16.1.2:9357/file-admin/api/out/ediOut";
+ //var url = "http://127.0.0.1:4523/m2/5660322-5340849-default/363076920";
var result = HttpHelper.Post(url, ediDto.ToJsonString());
var resp = JsonConvert.DeserializeObject<TowcsDto.TowcsResponse<object>>(result);
@@ -611,7 +586,7 @@
// 鏇存柊鏄庣粏鐘舵��
BaseDal.Db.Updateable<Dt_DeliveryOrderDetail>()
- .SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1, OotDetailStatus = "宸插畬鎴�" })
+ .SetColumns(d => new Dt_DeliveryOrderDetail { Status = 1, OotDetailStatus = "寮�濮�" })
.Where(d => d.DeliveryOrderId == order.Id && d.Status == 0)
.ExecuteCommand();
Console.WriteLine($"璁㈠崟 {order.Out_no} 鎺ㄩ�佹垚鍔�");
@@ -717,129 +692,41 @@
var responseContent = new WebResponseContent();
try
{
- // 鏌ユ壘鎵�鏈夆�滃紑濮嬧�濈姸鎬佺殑鍑哄簱鍗�
- var orders = BaseDal.Db.Queryable<Dt_DeliveryOrder>()
- .Where(o => o.OutStatus == "寮�濮�")
- .ToList();
-
- if (orders == null || !orders.Any())
+ #region 鏌ユ壘鎵�鏈夊凡瀹屾垚鍑哄簱鍗�
+ var outorders = BaseDal.QueryData(x => x.OutStatus == "宸插畬鎴�").Select(x => x.Out_no).Distinct().ToList();
+ foreach (var outorder in outorders)
{
- return responseContent.OK("鏆傛棤闇�瑕佸鐞嗙殑鍑哄簱鍗�");
- }
-
- int successCount = 0;
- int failCount = 0;
-
- foreach (var order in orders)
- {
- try
+ var Orders = BaseDal.Db.Queryable<Dt_DeliveryOrder>().Where(x => x.Out_no == outorder).Includes(x => x.Details).ToList();
+ if (!Orders.Where(x => x.OutStatus != "宸插畬鎴�").Any())
{
- 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.Ado.BeginTran();
+ BaseDal.DeleteAndMoveIntoHty(Orders, OperateTypeEnum.鑷姩瀹屾垚);
+ foreach (var item in Orders)
{
- // 鏇存柊鐘舵�佷负宸插畬鎴�
- 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);
- }
+ _deliveryOrderDetailServices.Repository.DeleteAndMoveIntoHty(item.Details, OperateTypeEnum.鑷姩瀹屾垚);
}
+ var url = "http://121.37.118.63:80/GYZ2/95fck/outOrderOk";
+ var requestDate = new
+ {
+ order_no = outorder
+ };
+ var result = HttpHelper.Post(url, requestDate.ToJsonString());
+ var response = JsonConvert.DeserializeObject<UpstreamOrderResponse>(result);
+ if (response.resultCode == "0") BaseDal.Db.Ado.CommitTran();
else
{
- // 鏈夋湭瀹屾垚鏄庣粏锛屼笉鏇存柊
- Db.Ado.RollbackTran();
+ BaseDal.Db.Ado.RollbackTran();
+ SendErrorToUpstream(4, "", $"涓婃父鎺ュ彛杩斿洖澶辫触: {response.resultMsg}", outorder);
}
}
- catch (Exception ex)
- {
- Db.Ado.RollbackTran();
- failCount++;
- SendErrorToUpstream(1, "", ex.Message, order.Out_no);
- }
}
+ #endregion
- return responseContent.OK($"鎵归噺澶勭悊瀹屾垚锛氭垚鍔� {successCount} 鍗曪紝澶辫触 {failCount} 鍗曘��");
+ return responseContent.OK();
}
catch (Exception ex)
{
+ BaseDal.Db.Ado.RollbackTran();
return responseContent.Error("鎵归噺澶勭悊澶辫触锛�" + ex.Message);
}
}
@@ -925,7 +812,7 @@
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();
List<Dt_DeliveryOrderDetail>? cabinOrderDetails = cabinOrder.Details?.Where(x => x.Status == 2).ToList();
- content.OK(data: cabinOrderDetails);
+ content.OK(data: cabinOrderDetails);
return content;
}
@@ -939,7 +826,20 @@
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();
+ OutTaskFinish(supplyTask);
+ }
+ catch (Exception ex)
+ {
+ content.Error(ex.Message);
+ }
+ return content;
+ }
+
+ public WebResponseContent OutTaskFinish(Dt_SupplyTask supplyTask)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
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($"鍑哄簱鍗曞凡瀹屾垚");
@@ -953,7 +853,7 @@
return WebResponseContent.Instance.Error($"鍑哄簱鏁伴噺涓嶅彲瓒呭嚭鍗曟嵁鏁伴噺");
- #region 澶勭悊鍑哄簱鍗曪紝璐т綅锛屽簱瀛橈紝搴撳瓨鎵规淇℃伅
+ #region 澶勭悊鍑哄簱鍗曪紝璐т綅锛屽簱瀛橈紝搴撳瓨鎵规淇℃伅,鍑哄簱浠诲姟
_unitOfWorkManage.BeginTran();
#region 鍑哄簱鍗�
@@ -962,21 +862,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 != "3").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}銆戠殑搴撳瓨淇℃伅");
+ 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
@@ -984,39 +883,47 @@
#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 = _basicService.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();
+ _basicService.LocationInfoService.UpdateData(location);
+ }
}
#endregion
- _supplyTaskService.UpdateData(supplyTask);
+ //_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)
{
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
-
+ if (supplyTask.WarehouseCode == WarehouseEnum.绔嬪簱.ObjToInt().ToString("000"))
+ CreateAllocatInOut(materielInfo);//鍒涘缓璋冩嫧浠诲姟
_unitOfWorkManage.CommitTran();
#endregion
content.OK();
}
catch (Exception ex)
{
- _unitOfWorkManage.RollbackTran();
content.Error(ex.Message);
}
return content;
--
Gitblit v1.9.3