From 5b4f00ff3ea04a3246a8f6f86bdefe749fcfd0c4 Mon Sep 17 00:00:00 2001
From: yuyou_x <2336760928@qq.com>
Date: 星期二, 26 三月 2024 08:24:28 +0800
Subject: [PATCH] 合并代码
---
Wms/WMS.IBLL/IBllAsnServer/IBllBoxInfoServer.cs | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/Wms/WMS.IBLL/IBllAsnServer/IBllBoxInfoServer.cs b/Wms/WMS.IBLL/IBllAsnServer/IBllBoxInfoServer.cs
index 23e97e8..9a2bcc2 100644
--- a/Wms/WMS.IBLL/IBllAsnServer/IBllBoxInfoServer.cs
+++ b/Wms/WMS.IBLL/IBllAsnServer/IBllBoxInfoServer.cs
@@ -4,6 +4,7 @@
using System.Collections.Generic;
using System.Text;
using Model.ModelDto.BllAsnDto;
+using WMS.Entity.BllAsnEntity;
namespace WMS.IBLL.IBllAsnServer
{
@@ -25,23 +26,64 @@
/// <returns></returns>
List<BoxInfoDto> GetBoxInfoList(string boxCode,string isContinue, string boxCode2);
+
+
+ /// <summary>
+ /// 鑾峰彇鏍囩绠辩爜淇℃伅
+ /// </summary>
+ /// <param name="model">鏌ヨ鏉′欢</param>
+ /// <param name="count">鏁伴噺</param>
+ /// <returns>鏍囩绠辩爜淇℃伅</returns>
+ List<BoxInfoDto> GetLabelBoxList(LabelBoxInfoVm model, out int count);
+
+ /// <summary>
+ /// 鑾峰彇鏍囩妯℃澘鏍规嵁鍏ュ簱鍗曟槑缁咺D
+ /// </summary>
+ /// <param name="id">鍏ュ簱鍗曟槑缁咺D</param>
+ /// <returns>鏍囩淇℃伅妯℃澘</returns>
+ BoxInfoDto GetLabelBoxModel(int id);
+
+
/// <summary>
/// 鑾峰彇鏍囩淇℃伅(鐢熸垚鏍囩)
/// </summary>
/// <param name="imId">鍏ュ簱鍗曟槑缁咺D</param>
/// <param name="isReset">鏄惁閲嶆柊鐢熸垚鑷湁鎵规 0:鍚� 1:鏄�</param>
/// <param name="arriveQty">鍒拌揣鏁伴噺</param>
- /// <param name="skuName">鐗╂枡鍚嶇О</param>
- /// <param name="standard">瑙勬牸/鍨嬪彿</param>
- /// <param name="packStandard">鍖呰瑙勬牸</param>
- /// <param name="skuNo">鐗╂枡缂栫爜</param>
- /// <param name="supplierLot">渚涘簲鍟嗘壒娆�</param>
/// <param name="productionTime">鐢熶骇鏃ユ湡</param>
/// <param name="expirationTime">鏈夋晥鏈熻嚦</param>
/// <param name="storeTime">鍌ㄥ瓨鏈熻嚦</param>
/// <param name="userId">鎿嶄綔浜�</param>
/// <returns></returns>
- List<LabelBoxDto> AddLabelBoxReturn(int imId, string isReset, decimal arriveQty, string skuName, string standard, string packStandard, string skuNo, string supplierLot, string productionTime, string expirationTime, string storeTime, int userId);
+ List<BllBoxInfo> AddLabelBox(int imId, string isReset, decimal arriveQty, string productionTime, string expirationTime, string storeTime, string supplierLot, int userId);
+
+ /// <summary>
+ /// 琛ユ墦鏍囩
+ /// </summary>
+ /// <param name="boxNo">寮�濮嬬鐮�</param>
+ /// <param name="endBoxNo">缁撴潫绠辩爜</param>
+ /// <param name="boxNo2">寮�濮嬫敮鐮�</param>
+ /// <param name="endBoxNo2">缁撴潫鏀爜</param>
+ /// <param name="type">1绠辩爜 2鏀爜 3绠辩爜鍜屾敮鐮�</param>
+ /// <param name="userId">鎿嶄綔浜篒D</param>
+ /// <returns></returns>
+ List<BoxInfoDto> GetBuDaLabelList(string boxNo, string endBoxNo, string boxNo2, string endBoxNo2, string type,
+ int userId);
+
+ /// <summary>
+ /// 鏍规嵁鍏ュ簱鍗曞彿杩囧幓鍗曟嵁涓嬫墍鏈夋壒娆″彿
+ /// </summary>
+ /// <param name="asnNo">鍏ュ簱鍗曞彿</param>
+ /// <returns>鎵规鍙烽泦鍚�</returns>
+ List<string> GetLotNoListByAsn(string asnNo);
+
+ /// <summary>
+ /// 鍒犻櫎鍗曟嵁涓嬪崟涓垨澶氫釜鎵规鐨勬爣绛�
+ /// </summary>
+ /// <param name="asnNo">鍏ュ簱鍗曞彿</param>
+ /// <param name="lotNo">鎵规鍙�</param>
+ /// <param name="userId">鎿嶄綔浜篒D</param>
+ void DelLabelByAsnNo(string asnNo, string lotNo,int userId);
}
}
--
Gitblit v1.8.0