From 2b49f7643d15b74889d190f216630559006ed93a Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 01 十二月 2025 09:48:43 +0800
Subject: [PATCH] pad和后端的优化
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Check.cs | 83 ++++++++++++++++++++++++++++++++++-------
1 files changed, 69 insertions(+), 14 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Check.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Check.cs"
index 0e53a22..1224203 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Check.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Check.cs"
@@ -1,10 +1,4 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common;
-using WIDESEA_Common.OrderEnum;
+锘縰sing WIDESEA_Common;
using WIDESEA_Common.StockEnum;
using WIDESEA_Common.TaskEnum;
using WIDESEA_Common.WareHouseEnum;
@@ -12,7 +6,6 @@
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_Model.Models;
-using static WIDESEA_DTO.SquareCabin.OrderDto;
namespace WIDESEA_SquareCabinServices
{
@@ -102,6 +95,7 @@
LocationCode = inventory.LocationCode,
OrderNo = deliveryOrder.Out_no,
StockQuantity = inventory.StockQuantity,
+ Modifier= inventory.ValidityPeriod,//鏁堟湡
SupplyQuantity = 0,
Remark = "鐩樼偣"
};
@@ -176,6 +170,35 @@
/// </summary>
/// <param name="saveModel"></param>
/// <returns></returns>
+ //public WebResponseContent CheckOutTasks(SaveModel saveModel)
+ //{
+ // WebResponseContent content = new WebResponseContent();
+ // try
+ // {
+ // int pageNo = saveModel.MainData["pageNo"].ObjToInt();
+ // string LocationCode = saveModel.MainData["locationCode"].ToString();
+ // string warehouseCode = saveModel.MainData["warehouseId"].ToString();
+ // string orderNo = saveModel.MainData["orderNo"].ToString();
+ // bool isCheck = saveModel.MainData["isCheck"].ObjToBool();
+ // var TaskStatus = isCheck ? SupplyStatusEnum.NewCheck.ObjToInt() : SupplyStatusEnum.NewOut.ObjToInt();
+ // List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
+ // if (string.IsNullOrEmpty(LocationCode))
+ // {
+ // supplyTasks = Db.Queryable<Dt_SupplyTask>().Where(x => x.TaskStatus == TaskStatus && x.OrderNo == orderNo && x.WarehouseCode == warehouseCode).ToPageList(pageNo, 5);
+ // }
+ // else
+ // {
+ // supplyTasks = Db.Queryable<Dt_SupplyTask>().Where(x => x.TaskStatus == TaskStatus && x.OrderNo == orderNo && x.WarehouseCode == warehouseCode && x.LocationCode.Contains(LocationCode)).ToPageList(pageNo, 5);
+ // }
+ // content.OK(data: supplyTasks);
+ // }
+ // catch (Exception ex)
+ // {
+ // content.Error(ex.Message);
+ // }
+ // return content;
+ //}
+
public WebResponseContent CheckOutTasks(SaveModel saveModel)
{
WebResponseContent content = new WebResponseContent();
@@ -187,15 +210,47 @@
string orderNo = saveModel.MainData["orderNo"].ToString();
bool isCheck = saveModel.MainData["isCheck"].ObjToBool();
var TaskStatus = isCheck ? SupplyStatusEnum.NewCheck.ObjToInt() : SupplyStatusEnum.NewOut.ObjToInt();
- List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
- if (string.IsNullOrEmpty(LocationCode))
+
+ // 浣跨敤鑱旇〃鏌ヨ鑾峰彇鐗╂枡璇︾粏淇℃伅
+ var query = Db.Queryable<Dt_SupplyTask>()
+ .LeftJoin<Dt_MaterielInfo>((task, materiel) => task.MaterielCode == materiel.MaterielCode)
+ .Where((task, materiel) => task.TaskStatus == TaskStatus && task.OrderNo == orderNo && task.WarehouseCode == warehouseCode);
+
+ if (!string.IsNullOrEmpty(LocationCode))
{
- supplyTasks = Db.Queryable<Dt_SupplyTask>().Where(x => x.TaskStatus == TaskStatus && x.OrderNo == orderNo && x.WarehouseCode == warehouseCode).ToPageList(pageNo, 5);
+ query = query.Where((task, materiel) => task.LocationCode.Contains(LocationCode));
}
- else
+
+ // 閫夋嫨闇�瑕佺殑瀛楁
+ var supplyTasks = query.Select((task, materiel) => new
{
- supplyTasks = Db.Queryable<Dt_SupplyTask>().Where(x => x.TaskStatus == TaskStatus && x.OrderNo == orderNo && x.WarehouseCode == warehouseCode && x.LocationCode.Contains(LocationCode)).ToPageList(pageNo, 5);
- }
+ // 浠诲姟琛ㄥ瓧娈�
+ task.TaskId,
+ task.TaskNum,
+ task.PalletCode,
+ task.BatchNo,
+ task.MaterielCode,
+ task.MaterielName,
+ task.MaterielSpec,//鐗╂枡瑙勬牸
+ task.TaskType,
+ task.TaskStatus,
+ task.WarehouseCode,
+ task.LocationCode,
+ task.StockQuantity,
+ task.SupplyQuantity,
+ task.OrderNo,
+ task.Dispatchertime,
+ task.Remark,
+ task.Modifier,//鏁堟湡
+ // 鐗╂枡琛ㄥ瓧娈�
+ item = materiel.item, // 鍝佸悕/閫氱敤鍚�
+ Factory = materiel.Factory, // 鐢熶骇鍘傚
+ MaterielUnit = materiel.MaterielUnit, // 鍩烘湰鍗曚綅
+ MaterielModel = materiel.MaterielModel, // 鐗╂枡鍨嬪彿
+ MaterielStoragecondition = materiel.MaterielStoragecondition, // 瀛樺偍鏉′欢锛堝彲鐢ㄤ簬鏁堟湡鐩稿叧锛�
+ })
+ .ToPageList(pageNo, 5);
+
content.OK(data: supplyTasks);
}
catch (Exception ex)
--
Gitblit v1.9.3