From b47a2f210d940eff8c7de4185305bc4e0184c590 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 17 十二月 2025 23:26:10 +0800
Subject: [PATCH] 新增空箱与回库功能，优化打印样式与逻辑printView1.vue**: 修复数据绑定拼写错误，优化打印逻辑与样式，调整二维码布局与大小。outboundOrder.js移除无用代码，清理gridBody` 和 `rowId`。 - **outPicking.vue**: 引入 `stationManager`，在 API 参数中增加 `station` 字段，优化样式。 - **ReturnToWarehouseDTO.cs**: 新增 DTO，支持 `palletCode`、`orderNo` 和 `station`。 - **IOutboundService.cs**: 定义 `EmptyBox` 和 `ReturnToWarehouse` 接口。 - **Dt_StockInfo_Hty.cs**: 修改继承关系，新增字段与导航属性。 - **OutboundService.cs**: 实现 `EmptyBox` 和 `ReturnToWarehouse` 方法，使用 `Mapster` 进行实体转换。 - **WIDESEA_OutboundService.csproj**: 引入 `Mapster` 依赖。 - **OutboundController.cs**: 新增 `EmptyBox` 和 `ReturnToWarehouse` 的 API 路由。
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_IBasicService/IBasicService.cs | 76 +++++++++++++++++++++++++++++++++++++
1 files changed, 75 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_IBasicService/IBasicService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_IBasicService/IBasicService.cs"
index b62017b..d11b0ae 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_IBasicService/IBasicService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_IBasicService/IBasicService.cs"
@@ -4,10 +4,11 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core;
+using WIDESEA_DTO.Base;
namespace WIDESEA_IBasicService
{
- public interface IBasicService: IDependency
+ public interface IBasicService : IDependency
{
/// <summary>
/// 璐т綅涓氬姟灞�
@@ -27,5 +28,78 @@
IPalletCodeInfoService PalletCodeInfoService { get; }
IMaterielCodeInfoService MaterielCodeInfoService { get; }
+
+ IMaterialUnitService MaterialUnitService { get; }
+
+ #region
+ string CreateCodeByRule(string ruleCode);
+ #endregion
+
+ #region 鍗曚綅杞崲
+ /// <summary>
+ /// 鍗曚綅杞崲
+ /// </summary>
+ /// <param name="materialCode"></param>
+ /// <param name="fromUnit"></param>
+ /// <param name="toUnit"></param>
+ /// <param name="quantity"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public UnitConvertResultDTO UnitQuantityConvert(string materialCode, string fromUnit, string toUnit, decimal quantity);
+
+ /// <summary>
+ /// 鍗曚綅杞崲锛岄鏂欒浆閲囪喘
+ /// </summary>
+ /// <param name="materialCode"></param>
+ /// <param name="quantity"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public UnitConvertResultDTO UnitUsageToPurchase(string materialCode, decimal quantity);
+
+ /// <summary>
+ /// 鍗曚綅杞崲锛岄鏂欒浆搴撳瓨
+ /// </summary>
+ /// <param name="materialCode"></param>
+ /// <param name="quantity"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public UnitConvertResultDTO UnitUsageToInventory(string materialCode, decimal quantity);
+
+ /// <summary>
+ /// 鍗曚綅杞崲锛岄噰璐浆搴撳瓨
+ /// </summary>
+ /// <param name="materialCode"></param>
+ /// <param name="quantity"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public UnitConvertResultDTO UnitPurchaseToInventory(string materialCode, decimal quantity);
+
+ /// <summary>
+ /// 鍗曚綅杞崲锛岄噰璐浆棰嗘枡
+ /// </summary>
+ /// <param name="materialCode"></param>
+ /// <param name="quantity"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public UnitConvertResultDTO UnitPurchaseToUsage(string materialCode, decimal quantity);
+
+ /// <summary>
+ /// 鍗曚綅杞崲锛屽簱瀛樿浆棰嗘枡
+ /// </summary>
+ /// <param name="materialCode"></param>
+ /// <param name="quantity"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public UnitConvertResultDTO UnitInventoryToUsage(string materialCode, decimal quantity);
+
+ /// <summary>
+ /// 鍗曚綅杞崲锛屽簱瀛樿浆閲囪喘
+ /// </summary>
+ /// <param name="materialCode"></param>
+ /// <param name="quantity"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public UnitConvertResultDTO UnitInventoryToPurchase(string materialCode, decimal quantity);
+ #endregion
}
}
--
Gitblit v1.9.3