first commit

wmsjst/JSMachine.WMS.Application/Dto/AGVTaskDto.cs

@@ -0,0 +1,135 @@
+using JSMachine.WMS.App.Dto.Enum;
+using Prism.Mvvm;
+
+namespace JSMachine.WMS.App.Dto
+{
+    public partial class AGVTaskDto: BindableBase, IRootDto
+    {
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// ErpTaskId
+        /// </summary>
+        public Guid ErpTaskId { get; set; }
+
+        /// <summary>
+        /// 合格证号
+        /// </summary>
+        public string BarCode { get; set; }
+
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public string OrderNo { get; set; }
+
+        /// <summary>       
+        /// 用户名称
+        /// </summary>
+        public string CustomName { get; set; }
+
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string MateriaName { get; set; }
+
+        /// <summary>
+        /// 物料类型       
+        /// </summary>
+        public string MateriaType { get; set; }
+
+        /// <summary>
+        /// 单个托盘上面的物料数量
+        /// </summary>
+        public int MateriaNum { get; set; }
+
+        /// <summary>
+        /// 批次号的生成规则为： 作业单号+日期+班次
+        /// </summary>
+        public string MateriaBatch { get; set; }
+
+        /// <summary>
+        /// 物料编号
+        /// </summary>
+        public string MateriaCode { get; set; }
+
+        /// <summary>
+        /// 联动线出口，机械手设备唯一号
+        /// </summary>
+        public string EquipmentNo { get; set; }
+
+        /// <summary>
+        /// 工单状态  1:生成任务   2:开始执行   3:第一次暂停   4:执行第二段   5:第二次暂停   6:执行第三段   7:执行成功   -1:任务取消
+        /// </summary>
+        public TaskStatusEnum TaskStatus { get; set; }
+
+        /// <summary>
+        /// 任务类型
+        /// </summary>
+        public TaskTypeEnum TaskType { get; set; }
+
+        /// <summary>
+        /// 优先级
+        /// </summary>
+        public PriorityEnum Priority { get; set; }
+
+        /// <summary>
+        /// 楼层
+        /// </summary>
+        public FloorEnum Floor { get; set; }
+
+        /// <summary>
+        /// 起点(库位编号)
+        /// </summary>
+        public string StartPositionCode { get; set; }
+
+        /// <summary>
+        /// 终点（库位编号)
+        /// </summary>
+        public string EndPositionCode { get; set; }
+
+        /// <summary>
+        /// 最终出库码头位置（仅对出库任务有效）  1：北区  2：南区  3：人工  4：退货到车间  99:其它
+        /// </summary>
+        public TransportEnum Transport { get; set; }
+
+        /// <summary>
+        /// 任务是否锁定（在锁定的情况下agvtask暂时不向rcs发送命令，待解锁后才可以，例如入库二楼提升机出口任务，如果托盘还未到出口则该任务还不能执行）
+        /// </summary>
+        public bool IsLock {  get; set; }
+
+        /// <summary>
+        /// Erp数据上传状态
+        /// </summary>
+        public ErpUploadStatusEnum ErpUploadStatus { get; set; }
+
+        /// <summary>
+        /// Erp返回错误信息
+        /// </summary>
+        public string ErpReturnMsg { get; set; }
+
+        /// <summary>
+        /// 重试次数
+        /// </summary>
+        public int RetryNum { get; set; }
+
+        /// <summary>
+        /// 分组Id
+        /// </summary>
+        public Guid GroupId { get; set; }
+
+        /// <summary>
+        /// 任务信息（生成失败提示等）
+        /// </summary>
+        public string TaskMsg { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreationTime { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? LastModifiedTime { get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/Bo/FullTextSearchByPageConditionBo.cs

@@ -0,0 +1,37 @@
+using JSMachine.WMS.App.Dto.Enum;
+using JSMachine.WMS.Infrastructure.LambdaHelp;
+using SqlSugar;
+
+namespace JSMachine.WMS.App.Dto.Bo
+{
+    /// <summary>
+    /// 全文搜索分页查询条件
+    /// </summary>
+    public class FullTextSearchByPageConditionBo
+    {
+        /// <summary>
+        /// 当前页
+        /// </summary>
+        public int CurrentPage { get; set; }
+        /// <summary>
+        /// 每页显示的条数
+        /// </summary>
+        public int PageSize { get; set; }
+        /// <summary>
+        /// 要排序的字段
+        /// </summary>
+        public string OrderByFiled { get; set; }
+        /// <summary>
+        ///排序方式
+        /// </summary>
+        public OrderByType OrderByType { get; set; }
+        /// <summary>
+        /// 全文搜索类型
+        /// </summary>
+        public FullTextSearchType FullTextSearchType { get; set; }
+        /// <summary>
+        /// 关键字
+        /// </summary>
+        public string KeyWords { get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/DeviceStateDto.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto
+{
+    public sealed class DeviceStateDto
+    {
+        /// <summary>
+        /// PLC连接状态
+        /// </summary>
+        public bool PLCConected { get; set; } = false;
+        /// <summary>
+        /// PLC是否显示
+        /// </summary>
+        public bool PLCVisible { get; set; } = false;
+        /// <summary>
+        /// DB连接状态
+        /// </summary>
+        public bool DBConected { get; set; } = false;
+        /// <summary>
+        /// DB是否显示
+        /// </summary>
+        public bool DBVisible { get; set; } = false;
+        /// <summary>
+        /// 扫码器1连接状态
+        /// </summary>
+        public bool CS1Conected { get; set; } = false;
+        /// <summary>
+        /// 扫码器1显示状态
+        /// </summary>
+        public bool CS1Visible { get; set; } = false;
+        /// <summary>
+        /// 扫码器2连接状态
+        /// </summary>
+        public bool CS2Conected { get; set; } = false;
+        /// <summary>
+        /// 扫码器2显示状态
+        /// </summary>
+        public bool CS2Visible { get; set; } = false;
+        /// <summary>
+        /// ERP连接状态
+        /// </summary>
+        public bool ERPConected { get; set; } = false;
+        /// <summary>
+        /// ERP显示状态
+        /// </summary>
+        public bool ERPVisible { get; set; } = false;
+        /// <summary>
+        /// ACS连接状态
+        /// </summary>
+        public bool ACSConected { get; set; } = false;
+        /// <summary>
+        /// ACS显示状态
+        /// </summary>
+        public bool ACSVisible { get; set; } = false;
+        /// <summary>
+        /// 地磅连接状态
+        /// </summary>
+        public bool WBConected { get; set; } = false;
+        /// <summary>
+        /// 地磅显示状态
+        /// </summary>
+        public bool WBVisible { get; set; } = false;
+        /// <summary>
+        /// 打印机连接状态
+        /// </summary>
+        public bool PrintConected { get; set; } = false;
+        /// <summary>
+        /// 打印机显示状态
+        /// </summary>
+        public bool PrintVisible { get; set; } = false;
+
+        /// <summary>
+        /// 进纸端Wifi连接状态
+        /// </summary>
+        public bool WifiConected { get; set; } = false;
+        /// <summary>
+        /// 进纸端Wifi显示状态
+        /// </summary>
+        public bool WifiVisible { get; set; } = false;
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/ERPTaskDto.cs

@@ -0,0 +1,145 @@
+using JSMachine.WMS.App.Dto.Enum;
+using Prism.Mvvm;
+
+namespace JSMachine.WMS.App.Dto
+{
+    public partial class ERPTaskDto: IRootDto
+    {
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// 库位编号(起点)
+        /// </summary>
+        public string StorageRackNo { get; set; }
+
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public string OrderNo { get; set; }
+
+        /// <summary>
+        /// 生产退库单号
+        /// </summary>
+        public string ProduceReturnCode { get; set; }
+
+        /// <summary>
+        /// 销售单号
+        /// </summary>
+        public string SaleNo { get; set; }
+
+        /// <summary>
+        /// 销售退库单号
+        /// </summary>
+        public string SaleReturnCode { get; set; }
+
+        /// <summary>
+        /// 合格证号
+        /// </summary>
+        public string BarCode { get; set; }
+
+        /// <summary>       
+        /// 用户名称
+        /// </summary>
+        public string CustomName { get; set; }
+
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string MateriaName { get; set; }
+
+        /// <summary>
+        /// 物料类型       
+        /// </summary>
+        public string MateriaType { get; set; }
+
+        /// <summary>
+        /// 批次号的生成规则为： 作业单号+日期+班次
+        /// </summary>
+        public string MateriaBatch { get; set; }
+
+        /// <summary>
+        /// 物料编号
+        /// </summary>
+        public string MateriaCode { get; set; }
+
+        /// <summary>
+        /// 联动线出口，机械手设备唯一号
+        /// </summary>
+        public string EquipmentNo { get; set; }
+
+        /// <summary>
+        /// erp下发命令中出入库总数量
+        /// </summary>
+        public int ErpOrderNum { get; set; }
+
+        /// <summary>
+        /// 任务状态
+        /// </summary>
+        public TaskStatusEnum TaskStatus { get; set; }
+
+        /// <summary>
+        /// 任务类型
+        /// </summary>
+        public TaskTypeEnum TaskType { get; set; }
+
+        /// <summary>
+        /// 楼层（入库，尾托回库指定楼层使用）
+        /// </summary>
+        public FloorEnum Floor { get; set; }
+
+        /// <summary>
+        /// 码头位置  1：北区  2：南区  3：人工  4：退货到车间  99:其它
+        /// </summary>
+        public TransportEnum Transport { get; set; }
+
+        /// <summary>
+        /// 优先级 1:入库  10:出库  20:托盘入库  30:托盘出库  40:移库  99:其它
+        /// </summary>
+        public PriorityEnum Priority { get; set; }
+
+        /// <summary>
+        /// 锁定  false:未锁定  true:锁定
+        /// </summary>
+        public bool IsLock { get; set; }
+
+        /// <summary>
+        /// 已上传给Erp的数量
+        /// </summary>
+        public int AlreadyUploadNum { get; set; }
+
+        /// <summary>
+        /// Erp出库撤单数量
+        /// </summary>
+        public int ErpCancelNum { get; set; }
+
+        /// <summary>
+        /// 回调Erp失败/成功  1:成功  0:失败
+        /// </summary>
+        public bool IsCallBackErpEnd { get; set; }
+
+        /// <summary>
+        /// Erp回调Wms接口地址
+        /// </summary>
+        public string ErpCallWmsInterface { get; set; }
+
+        /// <summary>
+        /// Wms回调Erp接口地址
+        /// </summary>
+        public string WmsCallErpInterface { get; set; }
+
+        /// <summary>
+        /// 任务信息（生成失败提示等）
+        /// </summary>
+        public string TaskMsg {get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreationTime { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? LastModifiedTime { get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/ElevatorCountDto.cs

@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto
+{
+    /// <summary>
+    /// 提升机取货信号统计信息
+    /// </summary>
+    public class ElevatorCountDto : IRootDto
+    {
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// 提升机编号（1 2）
+        /// </summary>
+        public int ElevatorNo { get; set; }
+        /// <summary>
+        /// 通道号（网带编号）
+        /// </summary>
+        public int ElevatorChannel { get; set; }
+        /// <summary>
+        /// 数量(放货口是wms实际放货的数量，取货口是PLC给的取货信号的次数,如果有货的时候重启wms会造成计数多一个)
+        /// </summary>
+        public int Count { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreationTime { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? LastModifiedTime { get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/ElevatorPlcQueueDto.cs

@@ -0,0 +1,36 @@
+using Prism.Mvvm;
+
+namespace JSMachine.WMS.App.Dto
+{
+    public partial class ElevatorPlcQueueDto : BindableBase, IRootDto
+    {
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// 提升机编号（1 2）
+        /// </summary>
+        public int ElevatorNo { get; set; }
+        /// <summary>
+        /// 通道号（网带编号）
+        /// </summary>
+        public int ElevatorChannel { get; set; }
+        /// <summary>
+        /// AgvTask的Id
+        /// </summary>
+        public Guid AgvTaskId { get; set; }
+        /// <summary>
+        /// 是否锁定
+        /// </summary>
+        public bool IsLock { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreationTime { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? LastModifiedTime { get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/Enum/BarCodeSource.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto.Enum
+{
+    /// <summary>
+    ///扫码信息来源
+    /// </summary>
+    public enum BarCodeSource
+    {
+        /// <summary>
+        /// 扫码器扫描
+        /// </summary>
+        CodeScanner = 0,
+        /// <summary>
+        /// 手持PDA上传
+        /// </summary>
+        PDA = 1
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/Enum/CallBackErpEndEnum.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto.Enum
+{
+    /// <summary>
+    /// 回调Erp失败/成功  1:成功  0:失败
+    /// </summary>
+    public enum CallBackErpEndEnum
+    {
+        /// <summary>
+        /// 失败
+        /// </summary>
+        fail = 0,
+        /// <summary>
+        /// 成功
+        /// </summary>
+        success = 1
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/Enum/ContainStatusEnum.cs

@@ -0,0 +1,35 @@
+using Newtonsoft.Json.Converters;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto.Enum
+{
+    /// <summary>
+    /// 库位状态
+    /// </summary>
+    [JsonConverter(typeof(StringEnumConverter))]
+    public enum StorageRackStatus
+    {
+        /// <summary>
+        /// 空闲
+        /// </summary>
+        Empty = 0,
+        /// <summary>
+        /// 有货
+        /// </summary>
+        HaveGoods = 1,
+        /// <summary>
+        /// 锁定
+        /// </summary>
+        Locked = 2,
+        /// <summary>
+        /// 禁用
+        /// </summary>
+        Disabled = 3,
+
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/Enum/ErpUploadStatusEnum.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto.Enum
+{
+    /// <summary>
+    /// Erp数据上传状态
+    /// </summary>
+    public enum ErpUploadStatusEnum
+    {
+        /// <summary>
+        /// 等待上传
+        /// </summary>
+        WaittingToUpload = 0,
+        /// <summary>
+        /// 上传成功
+        /// </summary>
+        UploadSuccess = 1,
+        /// <summary>
+        /// 上传失败
+        /// </summary>
+        UploadFailed = 2,
+        /// <summary>
+        /// 接口请求成功但数据被ERP拒收(可能是数据不符合ERP要求，但接口已经请求成功，此种情况系统仅做记录不处理)
+        /// </summary>
+        Refused = 3,
+        /// <summary>
+        /// 无需上传
+        /// </summary>
+        Unnecessary = 4
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/Enum/FloorEnum.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto.Enum
+{
+    /// <summary>
+    /// 楼层
+    /// </summary>
+    public enum FloorEnum
+    {
+        /// <summary>
+        /// 一楼
+        /// </summary>
+        FirstFloor=10,
+        /// <summary>
+        /// 二楼
+        /// </summary>
+        SecondFloor=20
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/Enum/FullTextSearchType.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto.Enum
+{
+    /// <summary>
+    /// 全文搜索类型
+    /// </summary>
+    public enum FullTextSearchType
+    {
+        /// <summary>
+        /// 精准搜索
+        /// </summary>
+        Equals=0,
+        /// <summary>
+        /// 模糊匹配
+        /// </summary>
+        Like=1
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/Enum/LockEnum.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto.Enum
+{
+    /// <summary>
+    /// 锁定/未锁定
+    /// </summary>
+    public enum LockEnum
+    {
+        /// <summary>
+        /// 未锁定
+        /// </summary>
+        noLock = 0,
+        /// <summary>
+        /// 锁定
+        /// </summary>
+        locked = 1
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/Enum/PrintType.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto.Enum
+{
+    public enum PrintType
+    {
+        /// <summary>
+        /// 新卷入库
+        /// </summary>
+        NewStock=0,
+        /// <summary>
+        /// 出库
+        /// </summary>
+        StockOut=1,
+        /// <summary>
+        /// 残卷回库
+        /// </summary>
+        ReStock=2
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/Enum/PriorityEnum.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto.Enum
+{
+    /// <summary>
+    /// 优先级(参照RCS来)
+    /// </summary>
+    public enum PriorityEnum
+    {
+        /// <summary>
+        /// 高
+        /// </summary>
+        High = 4,
+        /// <summary>
+        /// 中
+        /// </summary>
+        Middle = 6,
+        /// <summary>
+        /// 低
+        /// </summary>
+        Low = 8
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/Enum/ReStockInOriginEnum.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto.Enum
+{
+    /// <summary>
+    /// 残卷入库来源
+    /// </summary>
+    public enum ReStockInOriginEnum
+    {
+        /// <summary>
+        /// 自动入库
+        /// </summary>
+        AutoStockIn = 1,
+
+        /// <summary>
+        /// 编辑补录
+        /// </summary>
+        HandStockIn = 2,
+
+        /// <summary>
+        /// 新增补录
+        /// </summary>
+        AddHandStockIn = 3,
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/Enum/StockInTypeEnum.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto.Enum
+{
+    /// <summary>
+    /// 入库类型
+    /// </summary>
+    public enum StockInTypeEnum
+    {
+        /// <summary>
+        /// 新卷入库
+        /// </summary>
+        NewStockIn = 1,
+
+        /// <summary>
+        /// 新卷出库
+        /// </summary>
+        NewStockOut = 2,
+
+        /// <summary>
+        /// 残卷入库
+        /// </summary>
+        ReStockIn = 3,
+
+        /// <summary>
+        /// 残卷出库
+        /// </summary>
+        ReStockOut = 4
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/Enum/TaskStatusEnum.cs

@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto.Enum
+{
+    /// <summary>
+    /// 工单任务状态
+    /// </summary>
+    public enum TaskStatusEnum
+    {
+        /// <summary>
+        ///待执行
+        /// </summary>
+        [Description("待执行")]
+        Initial = 0,
+        /// <summary>
+        /// 执行中
+        /// </summary>
+        [Description("执行中")]
+        InExecution = 1,
+        /// <summary>
+        /// 执行成功
+        /// </summary>
+        [Description("执行成功")]
+        Completed = 2,
+        /// <summary>
+        /// 执行失败
+        /// </summary>
+        [Description("执行失败")]
+        Failed = 3,
+        /// <summary>
+        /// 暂停
+        /// </summary>
+        [Description("暂停")]
+        Paused = 4,
+        /// <summary>
+        /// 取货完成
+        /// </summary>
+        [Description("取货完成")]
+        PickupCompleted = 5,
+        /// <summary>
+        /// 取消
+        /// </summary>
+        [Description("取消")]
+        Cancelled = -1
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/Enum/TaskTypeEnum.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto.Enum
+{
+    /// <summary>
+    /// 任务类型
+    /// </summary>
+    public enum TaskTypeEnum
+    {
+        /// <summary>
+        /// 码垛入库
+        /// </summary>
+        [Description("码垛入库")]
+        MachineHandIn = 1,
+        /// <summary>
+        /// PDA入库
+        /// </summary>
+        [Description("PDA入库")]
+        PdaIn = 2,
+        /// <summary>
+        /// 销售出库
+        /// </summary>
+        [Description("销售出库")]
+        SaleOut = 3,
+        /// <summary>
+        /// 生产退库(出库的一种，只不过生产退库目的地为退库区)
+        /// </summary>
+        [Description("生产退库")]
+        ProductionOut = 4,
+        /// <summary>
+        /// 尾拖回库(流程和入库一样，但是数据不上传erp)
+        /// </summary>
+        [Description("尾拖回库")]
+        TailIn = 5,
+        /// <summary>
+        /// 搬运(清除起点物料信息，更新终点物料信息)
+        /// </summary>
+        [Description("搬运")]
+        Carry = 6,
+        /// <summary>
+        /// 中转入库(入库时没有可用库位，或者列被锁定，需要先进入中转区)
+        /// </summary>
+        [Description("中转入库")]
+        TransferStockIn = 7,
+        /// <summary>
+        /// 中转出库(出库暂无提升机，临时进入中转区的货物，需要再次进入提升机出库，需要关联出库的erp任务)
+        /// </summary>
+        [Description("中转出库")]
+        TransferStockOut = 8,
+        /// <summary>
+        /// 出库掏货(出库时前面有不同批次货物阻挡，需要将阻挡获取先运送到中转区)
+        /// </summary>
+        [Description("出库掏货")]
+        RemoveStockOutObstruction = 9
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/Enum/TransportEnum.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto.Enum
+{
+    /// <summary>
+    /// 码头位置
+    /// </summary>
+    public enum TransportEnum
+    {
+        /// <summary>
+        /// 北区(出库区)  定义和实际和南区是反的 实际为南区
+        /// </summary>
+        NorthArea = 1,
+        /// <summary>
+        /// 南区(出库区) 定义和实际和北区是反的 实际为北区
+        /// </summary>
+        SouthArea = 2,
+        /// <summary>
+        /// 人工入库区
+        /// </summary>
+        ManualArea = 3,
+        /// <summary>
+        /// 退库区
+        /// </summary>
+        ReturnStockArea = 4,
+        /// <summary>
+        /// 中间出库区
+        /// </summary>
+        MiddleOutArea=5,
+        /// <summary>
+        /// 中转区
+        /// </summary>
+        TransitArea=6,
+        /// <summary>
+        /// 提升机库区
+        /// </summary>
+        Elevator =98,
+        /// <summary>
+        /// 正常存储库区(入库区)
+        /// </summary>
+        NormalArea = 99
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/Enum/WantitErpUploadStatus.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto.Enum
+{
+    /// <summary>
+    /// 企望接口记录上传状态
+    /// </summary>
+    public enum WantitErpUploadStatus
+    {
+        /// <summary>
+        /// 等待上传
+        /// </summary>
+        WaittingToUpload = 0,
+        /// <summary>
+        /// 上传成功
+        /// </summary>
+        UploadSuccess = 1,
+        /// <summary>
+        /// 上传失败
+        /// </summary>
+        UploadFailed = 2,
+        /// <summary>
+        /// 接口请求成功但数据被ERP拒收(可能是数据不符合ERP要求，但接口已经请求成功，此种情况系统仅做记录不处理)
+        /// </summary>
+        Refused = 3
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/IRootDto.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace JSMachine.WMS.App.Dto
+{
+    public interface IRootDto
+    {
+        public Guid Id { get; set; }
+
+        public DateTime? CreationTime { get; set; }
+
+        public DateTime? LastModifiedTime { get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/OperationLogDto.cs

@@ -0,0 +1,46 @@
+using JSMachine.WMS.App.Dto;
+using JSMachine.WMS.Domain.Entity.Enums;
+using Prism.Mvvm;
+
+namespace JSMachine.WMS.Application.Dto
+{
+    public partial class OperationLogDto : IRootDto
+    {
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// 操作来源
+        /// </summary>
+        public OperationSource OperationSource { get; set; }
+
+        /// <summary>
+        /// 操作类型
+        /// </summary>
+        public OperationType OperationType { get; set; }
+
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        public string UserId { get; set; }
+
+        /// <summary>
+        /// 旧对象数据
+        /// </summary>
+        public string OldObject { get; set; }
+
+        /// <summary>
+        /// 新对象数据
+        /// </summary>
+        public string NewObject { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreationTime { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? LastModifiedTime { get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/PagedResultDto.cs

@@ -0,0 +1,66 @@
+using JSMachine.WMS.Domain.IRepository;
+using System.Collections.Generic;
+
+namespace JSMachine.WMS.App.Dto
+{
+    public class PagedResultDto<T>
+    {
+        public static readonly PagedResultDto<T> EmptyPagedResult = new PagedResultDto<T>(0, 0, 0, 0, null);
+
+        #region Public Properties
+        /// <summary>
+        /// 总记录数
+        /// </summary>
+        public int TotalRecords { get; set; }
+
+        /// <summary>
+        /// 总页数
+        /// </summary>
+        public int TotalPages { get; set; }
+
+        /// <summary>
+        /// 每页的记录数
+        /// </summary>
+        public int PageSize { get; set; }
+
+        /// <summary>
+        /// 当前页码
+        /// </summary>
+        public int PageNumber { get; set; }
+
+        /// <summary>
+        /// 获取或设置当前页码的记录
+        /// </summary>
+        public List<T> PageData { get; set; }
+
+        #endregion
+
+
+        public PagedResultDto()
+        {
+            this.PageData = new List<T>();
+        }
+
+        public PagedResultDto(int totalRecords, int totalPages, int pageSize, int pageNumber, List<T> data)
+        {
+            this.TotalPages = totalPages;
+            this.TotalRecords = totalRecords;
+            this.PageSize = pageSize;
+            this.PageNumber = pageNumber;
+            this.PageData = data;
+        }
+
+        public PagedResultDto(int totalRecords, int pageSize, int pageNumber, List<T> data)
+        {
+            if (pageSize > 0)
+            {
+                this.TotalPages = totalRecords % pageSize == 0 ? totalRecords / pageSize : totalRecords / pageSize + 1;
+            }
+
+            this.TotalRecords = totalRecords;
+            this.PageSize = pageSize;
+            this.PageNumber = pageNumber;
+            this.PageData = data;
+        }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/PaperBindInfoDto.cs

@@ -0,0 +1,145 @@
+
+namespace JSMachine.WMS.App.Dto
+{
+    /// <summary>
+    /// 原纸绑定机台信息
+    /// </summary>
+    public class PaperBindInfoDto
+    {
+        /// <summary>
+        /// 此条码入库重量
+        /// </summary>
+        public int ReceiveQty { get; set; }
+        /// <summary>
+        /// 材质
+        /// </summary>
+        public string Paper { get; set; }
+        /// <summary>
+        /// 供应商编号
+        /// </summary>
+        public string SuppID { get; set; }
+        /// <summary>
+        /// 条码
+        /// </summary>
+        public string Barcode { get; set; }
+        /// <summary>
+        /// 幅宽
+        /// </summary>
+        public string PaperWidth { get; set; }
+        /// <summary>
+        /// 米数(米)
+        /// </summary>
+        public string StockMeter { get; set; }
+        public string WorkingGroup { get; set; }
+        /// <summary>
+        /// 入库单号
+        /// </summary>
+        public string ReceiveNote { get; set; }
+        /// <summary>
+        /// 规格型号说明
+        /// </summary>
+        public string StockDescription { get; set; }
+        /// <summary>
+        /// 克重
+        /// </summary>
+        public string GPerM2 { get; set; }
+        /// <summary>
+        /// 库区
+        /// </summary>
+        public string Location { get; set; }
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public float UnitPrice { get; set; }
+        /// <summary>
+        /// 可用状态
+        /// X表示不可使用
+        /// NULL、空、V均表示可用
+        /// </summary>
+        public string CanUse { get; set; }
+        /// <summary>
+        /// 物料号
+        /// </summary>
+        public string StockItem { get; set; }
+        /// <summary>
+        /// 残卷标志
+        /// </summary>
+        public string StockMark { get; set; }
+        /// <summary>
+        /// 物料号
+        /// </summary>
+        public string StockType { get; set; }
+        /// <summary>
+        /// 该纸卷库存的唯一身份标记
+        /// </summary>
+        public string ObjID { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string GroupManagementDistributedFactoryID { get; set; }
+        /// <summary>
+        /// 重量(公斤)
+        /// </summary>
+        public string ActualQty { get; set; }
+        /// <summary>
+        /// 供应商简称
+        /// </summary>
+        public string SuppShortName { get; set; }
+        /// <summary>
+        /// 制造商
+        /// </summary>
+        public string Maker { get; set; }
+        /// <summary>
+        /// 库位
+        /// </summary>
+        public string LocSub { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int ReceiveDiameter { get; set; }
+
+        /// <summary>
+        /// 手动指定机台号
+        /// </summary>
+        public int HandMachineNum { get; set; }
+
+        /// <summary>
+        /// 进纸状态(0:未进纸  1:已进纸)
+        /// </summary>
+        public int InPaperState { get; set; }
+
+        /// <summary>
+        /// 需要的纸质(未代纸情况下此值和实际纸质相等，代纸情况下则不等)
+        /// </summary>
+        public string WantedPaperCode { get; set; }
+
+        /// <summary>
+        /// 需要的幅宽（未代纸情况下此值和实际幅宽相等，代纸情况下则不等）
+        /// </summary>
+        public int WantedPaperWidth { get; set; }
+
+        /// <summary>
+        /// 代纸状态(0: 未代纸  1:已代纸)
+        /// </summary>
+        public int ReplacePaperState { get; set; }
+
+        /// <summary>
+        /// 需要的机台（未代纸情况下此值和实际机台相等，代纸情况下则不等）
+        /// </summary>
+        public int WantedMachineNum { get; set; }
+
+        /// <summary>
+        /// 纸质
+        /// </summary>
+        public string PaperMassCode { get; set; }
+        /// <summary>
+        /// 幅宽
+        /// </summary>
+        public int Web { get; set; }
+
+        /// <summary>
+        /// 机台
+        /// </summary>
+        public int MachineNum { get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/PaperBindNumDto.cs

@@ -0,0 +1,136 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto
+{
+    /// <summary>
+    /// 原纸绑定机台信息
+    /// </summary>
+    public class PaperBindNumDto
+    {
+        /// <summary>
+        /// 此条码入库重量
+        /// </summary>
+        public int ReceiveQty { get; set; }
+        /// <summary>
+        /// 材质
+        /// </summary>
+        public string Paper { get; set; }
+        /// <summary>
+        /// 供应商编号
+        /// </summary>
+        public string SuppID { get; set; }
+        /// <summary>
+        /// 条码
+        /// </summary>
+        public string Barcode { get; set; }
+        /// <summary>
+        /// 幅宽
+        /// </summary>
+        public string PaperWidth { get; set; }
+        /// <summary>
+        /// 米数(米)
+        /// </summary>
+        public string StockMeter { get; set; }
+        public string WorkingGroup { get; set; }
+        /// <summary>
+        /// 入库单号
+        /// </summary>
+        public string ReceiveNote { get; set; }
+        /// <summary>
+        /// 规格型号说明
+        /// </summary>
+        public string StockDescription { get; set; }
+        /// <summary>
+        /// 克重
+        /// </summary>
+        public string GPerM2 { get; set; }
+        /// <summary>
+        /// 库区
+        /// </summary>
+        public string Location { get; set; }
+        /// <summary>
+        /// 单价
+        /// </summary>
+        public float UnitPrice { get; set; }
+        /// <summary>
+        /// 可用状态
+        /// X表示不可使用
+        /// NULL、空、V均表示可用
+        /// </summary>
+        public string CanUse { get; set; }
+        /// <summary>
+        /// 物料号
+        /// </summary>
+        public string StockItem { get; set; }
+        /// <summary>
+        /// 残卷标志
+        /// </summary>
+        public string StockMark { get; set; }
+        /// <summary>
+        /// 物料号
+        /// </summary>
+        public string StockType { get; set; }
+        /// <summary>
+        /// 该纸卷库存的唯一身份标记
+        /// </summary>
+        public string ObjID { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string GroupManagementDistributedFactoryID { get; set; }
+        /// <summary>
+        /// 重量(公斤)
+        /// </summary>
+        public string ActualQty { get; set; }
+        /// <summary>
+        /// 供应商简称
+        /// </summary>
+        public string SuppShortName { get; set; }
+        /// <summary>
+        /// 制造商
+        /// </summary>
+        public string Maker { get; set; }
+        /// <summary>
+        /// 库位
+        /// </summary>
+        public string LocSub { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public int ReceiveDiameter { get; set; }
+
+        /// <summary>
+        /// 手动指定机台号
+        /// </summary>
+        public int HandMachineNum { get; set; }
+
+        /// <summary>
+        /// 进纸状态(0:未进纸  1:已进纸)
+        /// </summary>
+        public int InPaperState { get; set; }
+
+        /// <summary>
+        /// 需要的纸质(未代纸情况下此值和实际纸质相等，代纸情况下则不等)
+        /// </summary>
+        public string WantedPaperCode { get; set; }
+
+        /// <summary>
+        /// 需要的幅宽（未代纸情况下此值和实际幅宽相等，代纸情况下则不等）
+        /// </summary>
+        public int WantedPaperWidth { get; set; }
+
+        /// <summary>
+        /// 代纸状态(0: 未代纸  1:已代纸)
+        /// </summary>
+        public int ReplacePaperState { get; set; }
+
+        /// <summary>
+        /// 需要的机台（未代纸情况下此值和实际机台相等，代纸情况下则不等）
+        /// </summary>
+        public int WantedMachineNum { get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/PaperNewStockInDto.cs

@@ -0,0 +1,174 @@
+using Prism.Mvvm;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Diagnostics.CodeAnalysis;
+
+namespace JSMachine.WMS.App.Dto
+{
+    public partial class PaperNewStockInDto : BindableBase, IRootDto
+    {
+        public Guid Id { get; set; }
+
+        private string _paperLabel;
+        /// <summary>
+        /// 原纸卷标
+        /// </summary>
+        public string PaperLabel 
+        {
+            get => _paperLabel;
+            set => SetProperty(ref _paperLabel, value);
+        }
+
+        private string _productLineName;
+        /// <summary>
+        /// 产线名称
+        /// </summary>
+        public string ProductLineName 
+        {
+            get => _productLineName;
+            set => SetProperty(ref _productLineName, value);
+        }
+
+        private string _supplier;
+        /// <summary>
+        /// 供应商
+        /// </summary>
+        public string Supplier
+        {
+            get => _supplier;
+            set => SetProperty(ref _supplier, value);
+        }
+
+        private string _makerName;
+        /// <summary>
+        /// 制造商
+        /// </summary>
+        public string MakerName
+        {
+            get => _makerName;
+            set => SetProperty(ref _makerName, value);
+        }
+
+        private string _stockHouseName;
+        /// <summary>
+        /// 仓库名称
+        /// </summary>
+        public string StockHouseName
+        {
+            get => _stockHouseName;
+            set => SetProperty(ref _stockHouseName, value);
+        }
+
+        private string _stockInType;
+        /// <summary>
+        /// 入库类型
+        /// </summary>
+        public string StockInType
+        {
+            get => _stockHouseName;
+            set => SetProperty(ref _stockHouseName, value);
+        }
+
+        private string _locationMark;
+        /// <summary>
+        /// 库位
+        /// </summary>
+        public string LocationMark
+        {
+            get => _locationMark;
+            set => SetProperty(ref _locationMark, value);
+        }
+
+        private int _paperUnitWeight;
+        /// <summary>
+        /// 原纸克重
+        /// </summary>
+        public int PaperUnitWeight
+        {
+            get => _paperUnitWeight;
+            set => SetProperty(ref _paperUnitWeight, value);
+        }
+
+        private string _paperCode;
+        /// <summary>
+        /// 原纸编码(纸质)
+        /// </summary>
+        public string PaperCode
+        {
+            get => _paperCode;
+            set => SetProperty(ref _paperCode, value);
+        }
+
+        private int _paperWidth;
+        /// <summary>
+        /// 门幅
+        /// </summary>
+        public int PaperWidth
+        {
+            get => _paperWidth;
+            set => SetProperty(ref _paperWidth, value);
+        }
+
+        private decimal _inWeight;
+        /// <summary>
+        /// 入库重量
+        /// </summary>
+        public decimal InWeight
+        {
+            get => _inWeight;
+            set => SetProperty(ref _inWeight, value);
+        }
+
+        private decimal _meterLength;
+        /// <summary>
+        /// 米长
+        /// </summary>
+        public decimal MeterLength
+        {
+            get => _meterLength;
+            set => SetProperty(ref _meterLength, value);
+        }
+
+        private string _memo;
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Memo
+        {
+            get => _memo;
+            set => SetProperty(ref _memo, value);
+        }
+
+        private int _printState;
+        /// <summary>
+        /// 打印状态（0:未打印  1:已打印）
+        /// </summary>
+        public int PrintState
+        {
+            get => _printState;
+            set => SetProperty(ref _printState, value);
+        }
+
+        private DateTime? _printTime;
+        /// <summary>
+        /// 打印时间
+        /// </summary>
+        public DateTime? PrintTime
+        {
+            get => _printTime;
+            set => SetProperty(ref _printTime, value);
+        }
+
+        private DateTime? _creationTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreationTime
+        {
+            get => _creationTime;
+            set => SetProperty(ref _creationTime, value);
+        }
+
+        public DateTime? LastModifiedTime { get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/PaperReStockInDto.cs

@@ -0,0 +1,182 @@
+using JSMachine.WMS.App.Dto.Enum;
+using Prism.Mvvm;
+
+namespace JSMachine.WMS.App.Dto
+{
+    public partial class PaperReStockInDto : BindableBase, IRootDto
+    {
+        public Guid Id { get; set; }
+
+        private string _paperLabel;
+        /// <summary>
+        /// 原纸卷标
+        /// </summary>
+        public string PaperLabel
+        {
+            get => _paperLabel;
+            set => SetProperty(ref _paperLabel, value);
+        }
+
+        /// <summary>
+        /// 产线名称
+        /// </summary>
+        public string ProductLineName { get; set; }
+
+        private string _supplier;
+        /// <summary>
+        /// 供应商
+        /// </summary>
+        public string Supplier
+        {
+            get => _supplier;
+            set => SetProperty(ref _supplier, value);
+        }
+
+        private string _makerName;
+        /// <summary>
+        /// 制造商
+        /// </summary>
+        public string MakerName
+        {
+            get => _makerName;
+            set => SetProperty(ref _makerName, value);
+        }
+
+        /// <summary>
+        /// 仓库名称
+        /// </summary>
+        public string _stockHouseName;
+        public string StockHouseName
+        {
+            get => _stockHouseName;
+            set => SetProperty(ref _stockHouseName, value);
+        }
+
+        private string _locationMark;
+        /// <summary>
+        /// 库位
+        /// </summary>
+        public string LocationMark
+        {
+            get => _locationMark;
+            set => SetProperty(ref _locationMark, value);
+        }
+
+        /// <summary>
+        /// 入库类型
+        /// </summary>
+        public string StockInType { get; set; }
+
+        private int _paperUnitWeight;
+        /// <summary>
+        /// 原纸克重
+        /// </summary>
+        public int PaperUnitWeight
+        {
+            get => _paperUnitWeight;
+            set => SetProperty(ref _paperUnitWeight, value);
+        }
+
+        private string _paperCode;
+        /// <summary>
+        /// 原纸编码(纸质)
+        /// </summary>
+        public string PaperCode
+        {
+            get => _paperCode;
+            set => SetProperty(ref _paperCode, value);
+        }
+
+        private int _paperWidth;
+        /// <summary>
+        /// 门幅
+        /// </summary>
+        public int PaperWidth
+        {
+            get => _paperWidth;
+            set => SetProperty(ref _paperWidth, value);
+        }
+
+        private decimal _inWeight;
+        /// <summary>
+        /// 入库重量
+        /// </summary>
+        public decimal InWeight
+        { 
+            get=> _inWeight;
+            set => SetProperty(ref _inWeight, value);
+        }
+
+        private decimal _meterLength;
+        /// <summary>
+        /// 米长
+        /// </summary>
+        public decimal MeterLength
+        {
+            get => _meterLength;
+            set => SetProperty(ref _meterLength, value);
+        }
+
+        private string _teamName;
+        /// <summary>
+        /// 班组
+        /// </summary>
+        public string TeamName
+        {
+            get => _teamName;
+            set => SetProperty(ref _teamName, value);
+        }
+
+        /// <summary>
+        /// 批次Id
+        /// </summary>
+        public Guid? BathId { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Memo { get; set; }
+
+        /// <summary>
+        /// 打印时间
+        /// </summary>
+        public DateTime? PrintTime { get; set; }
+
+        private DateTime? _creationTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreationTime
+        {
+            get => _creationTime;
+            set => SetProperty(ref _creationTime, value);
+        }
+
+        public DateTime? LastModifiedTime { get; set; }
+
+        /// <summary>
+        /// 来源
+        /// </summary>
+        public ReStockInOriginEnum Origin { get; set; }
+
+        /// <summary>
+        /// 企望接口入库记录上传状态
+        /// 0-等待上传，
+        ///1-上传成功，
+        ///2-上传失败
+        ///3-接口请求成功但数据被ERP拒收(可能是数据不符合ERP要求，但接口已经请求成功，此种情况系统仅做记录不处理)
+        /// </summary>
+        public WantitErpUploadStatus WantitErpUploadStatus { get; set; }
+
+        /// <summary>
+        /// 信息来源（0-扫码器扫描 1-手持PDA上传）
+        /// </summary>
+        public BarCodeSource BarCodeSource { get; set; }
+
+        /// <summary>
+        /// Erp接口调用成功，但是返回入库失败
+        /// </summary>
+        public string ErpStockInMsg { get; set; }
+    }
+
+}

wmsjst/JSMachine.WMS.Application/Dto/PaperStockOutDto.cs

@@ -0,0 +1,201 @@
+using JSMachine.WMS.App.Dto.Enum;
+using JSMachine.WMS.Domain.Entity.Enums;
+using Prism.Mvvm;
+
+namespace JSMachine.WMS.App.Dto
+{
+    public partial class PaperStockOutDto : BindableBase, IRootDto
+    {
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// ACS中的Id
+        /// </summary>
+        public Guid AcsId { get; set; }
+
+        /// <summary>
+        /// 结束状态
+        /// </summary>
+        public int FinishState { get; set; }
+
+        /// <summary>
+        /// 每批所包含的全部Id
+        /// </summary>
+        public string Ids { get; set; }
+
+        /// <summary>
+        /// 新卷残卷Id
+        /// </summary>
+        public Guid NewStockReStockID { get; set; }
+
+        private string _paperLable;
+        /// <summary>
+        /// 原纸卷标
+        /// </summary>
+        public string PaperLabel
+        {
+            get => _paperLable;
+            set => SetProperty(ref _paperLable, value);
+        }
+
+        private string _productLineName;
+        /// <summary>
+        /// 产线名称
+        /// </summary>
+        public string ProductLineName
+        {
+            get => _productLineName;
+            set => SetProperty(ref _productLineName, value);
+        }
+
+        private string _supplier;
+        /// <summary>
+        /// 供应商
+        /// </summary>
+        public string Supplier
+        {
+            get => _supplier;
+            set => SetProperty(ref _supplier, value);
+        }
+
+        private string _makerName;
+        /// <summary>
+        /// 制造商
+        /// </summary>
+        public string MakerName
+        {
+            get => _makerName;
+            set => SetProperty(ref _makerName, value);
+        }
+
+        private int _paperUnitWeight;
+        /// <summary>
+        /// 原纸克重
+        /// </summary>
+        public int PaperUnitWeight
+        {
+            get => _paperUnitWeight;
+            set => SetProperty(ref _paperUnitWeight, value);
+        }
+
+        private string _paperCode;
+        /// <summary>
+        /// 原纸编码(纸质)
+        /// </summary>
+        public string PaperCode
+        {
+            get => _paperCode;
+            set => SetProperty(ref _paperCode, value);
+        }
+
+        private int _paperWidth;
+        /// <summary>
+        /// 门幅
+        /// </summary>
+        public int PaperWidth
+        {
+            get => _paperWidth;
+            set => SetProperty(ref _paperWidth, value);
+        }
+
+        private decimal _outWeight;
+        /// <summary>
+        /// 出库重量
+        /// </summary>
+        public decimal OutWeight
+        {
+            get => _outWeight;
+            set => SetProperty(ref _outWeight, value);
+        }
+
+        private string _stockHouseName;
+        /// <summary>
+        /// 仓库名称
+        /// </summary>
+        public string StockHouseName
+        {
+            get => _stockHouseName;
+            set => SetProperty(ref _stockHouseName, value);
+        }
+
+        /// <summary>
+        /// 原纸出库类型
+        /// </summary>
+        public string StockOutType { get; set; }
+
+        private decimal _meterLength;
+        /// <summary>
+        /// 米长
+        /// </summary>
+        public decimal MeterLength
+        {
+            get => _meterLength;
+            set => SetProperty(ref _meterLength, value);
+        }
+
+        /// <summary>
+        /// 机台
+        /// </summary>
+        public string MachineNum { get; set; }
+
+        /// <summary>
+        /// 库位
+        /// </summary>
+        public string LocationMark { get; set; }
+
+        /// <summary>
+        /// 是否在库（0:不在库   1:在库）
+        /// </summary>
+        public int InOutState { get; set; }
+
+        private string _memo;
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Memo
+        {
+            get => _memo;
+            set => SetProperty(ref _memo, value);
+        }
+
+        /// <summary>
+        /// 企望接口出库记录上传状态
+        /// </summary>
+        public WantitErpUploadStatus WantitErpUploadStatus { get; set; }
+        /// <summary>
+        /// 扫码信息来源
+        /// </summary>
+        public BarCodeSource BarCodeSource { get; set; }
+
+        /// <summary>
+        /// 需要的纸质(未代纸情况下此值和实际纸质相等，代纸情况下则不等)
+        /// </summary>
+        public string WantedPaperCode { get; set; }
+        /// <summary>
+        /// 需要的幅宽（未代纸情况下此值和实际幅宽相等，代纸情况下则不等）
+        /// </summary>
+        public int WantedPaperWidth { get; set; }
+
+        private DateTime? _creationTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreationTime
+        {
+            get => _creationTime;
+            set => SetProperty(ref _creationTime, value);
+        }
+
+        public DateTime? LastModifiedTime { get; set; }
+
+        /// <summary>
+        /// Erp接口调用成功，但是返回入库失败
+        /// </summary>
+        public string ErpStockInMsg { get; set; }
+
+        /// <summary>
+        /// 备纸错误状态（0:正常  1:错误）
+        /// </summary>
+        public PreparationErrorStateEnum PreparationErrorState { get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/PreparationBindMachineDto.cs

@@ -0,0 +1,106 @@
+using JSMachine.WMS.App.Dto.Enum;
+using JSMachine.WMS.Domain.Entity.Enums;
+using Prism.Mvvm;
+
+namespace JSMachine.WMS.App.Dto
+{
+    public partial class PreparationBindMachineDto: BindableBase, IRootDto
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// 原纸卷标
+        /// </summary>
+        public string PaperLabel { get; set; }
+
+        /// <summary>
+        /// 材质
+        /// </summary>
+        public string PaperMassCode { get; set; }
+
+        /// <summary>
+        /// 门幅
+        /// </summary>
+        public int PaperWidth { get; set; }
+
+        /// <summary>
+        /// 米长
+        /// </summary>
+        public decimal MeterLength { get; set; }
+
+        /// <summary>
+        /// 重量
+        /// </summary>
+        public decimal Weight { get; set; }
+
+        /// <summary>
+        /// 库位
+        /// </summary>
+        public string LocationMark { get; set; }
+
+        /// <summary>
+        /// 库区
+        /// </summary>
+        public string LocSub { get; set; }
+
+        /// <summary>
+        /// 供应商简称
+        /// </summary>
+        public string SuppShortName { get; set; }
+
+        /// <summary>
+        /// 原纸克重
+        /// </summary>
+        public int PaperUnitWeight { get; set; }
+
+        /// <summary>
+        /// 制造商
+        /// </summary>
+        public string Maker { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreationTime { get; set; }
+
+        public DateTime? LastModifiedTime { get; set; }
+
+        /// <summary>
+        /// 手动指定机台号
+        /// </summary>
+        public int HandMachineNum { get; set; }
+
+        /// <summary>
+        /// 进纸状态(0:未进纸  1:已进纸)
+        /// </summary>
+        public int InPaperState { get; set; }
+
+        /// <summary>
+        /// 需要的纸质(未代纸情况下为空，代纸情况下有值)
+        /// </summary>
+        public string WantedPaperCode { get; set; }
+
+        /// <summary>
+        /// 需要的幅宽（未代纸情况下为空，代纸情况下有值）
+        /// </summary>
+        public int WantedPaperWidth { get; set; }
+
+        /// <summary>
+        /// 代纸状态(0: 未代纸  1:已代纸)
+        /// </summary>
+        public int ReplacePaperState { get; set; }
+
+        /// <summary>
+        /// 需要的机台（未代纸情况下为空，代纸情况下有值）
+        /// </summary>
+        public int WantedMachineNum { get; set; }
+
+        /// <summary>
+        /// 该纸卷库存的唯一身份标记
+        /// </summary>
+        public string ObjID { get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/RcsTaskDto.cs

@@ -0,0 +1,56 @@
+using JSMachine.WMS.Domain.Repository;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto
+{
+    /// <summary>
+    /// rcs系统的任务信息。模拟测试用
+    /// </summary>
+    public class RcsTaskDto : IRootDto
+    {
+        public Guid Id { get; set; }
+        /// <summary>
+        /// 任务id
+        /// </summary>
+        public string TaskId { get; set; }
+        /// <summary>
+        /// wms上传时间
+        /// </summary>
+        public DateTime UploadTime { get; set; }
+        /// <summary>
+        /// 起点
+        /// </summary>
+        public string StartPositionCode { get; set; }
+        /// <summary>
+        /// 终点
+        /// </summary>
+        public string EndPositionCode { get; set; }
+        /// <summary>
+        /// 任务状态
+        /// 3:已取消
+        /// 5:发送失败
+        /// 6:运行中
+        ///7:执行失败
+        ///8:已完成
+        ///9:已下发
+        ///10:等待确认
+        ///20:取货中
+        ///21:取货完成
+        ///22:放货中
+        ///23:放货完成
+        /// 必须
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreationTime { get; set; }
+
+        public DateTime? LastModifiedTime { get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/ReAutoStockIn.cs

@@ -0,0 +1,27 @@
+using JSMachine.WMS.App.Dto.Enum;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto
+{
+    public partial class ReAutoStockIn
+    {
+        /// <summary>
+        /// 原纸卷标
+        /// </summary>
+        public string PaperLabel { get; set; }
+
+        /// <summary>
+        /// 入库重量
+        /// </summary>
+        public decimal InWeight { get; set; }
+
+        /// <summary>
+        /// 扫码信息来源
+        /// </summary>
+        public BarCodeSource BarCodeSource { get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/RootDto.cs

@@ -0,0 +1,25 @@
+using System;
+
+namespace JSMachine.WMS.App.Dto
+{
+    /// <summary>
+    /// 应用层数据传输对象的公共基类，提供实体标识和审计时间字段。
+    /// </summary>
+    public class RootDto
+    {
+        /// <summary>
+        /// DTO 对应的实体唯一标识。
+        /// </summary>
+        public virtual string Id { get; set; }
+
+        /// <summary>
+        /// 数据创建时间。
+        /// </summary>
+        public virtual DateTime CreationTime { get; set; }
+
+        /// <summary>
+        /// 数据最后修改时间。
+        /// </summary>
+        public virtual DateTime LastModifiedTime { get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/SelectRowsDto.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto
+{
+    public class SelectRowsDto
+    {
+        public List<PaperBindInfoDto> PaperBindInfoDtos {  get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/StorageRackDto.cs

@@ -0,0 +1,281 @@
+using JSMachine.WMS.App.Dto.Enum;
+using NPOI.SS.Formula.Functions;
+using System.Diagnostics.CodeAnalysis;
+
+namespace JSMachine.WMS.App.Dto
+{
+    public partial class StorageRackDto : IRootDto
+    {
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// 库位编号
+        /// </summary>
+        public string StorageRackNo { get; set; }
+
+        /// <summary>
+        /// 途径提升机指定点的坐标
+        /// </summary>
+        public string AgvPassPointNum { get; set; }
+
+        /// <summary>
+        /// 提升机通道号（PLC定义的网带编号），提升机库位专用
+        /// </summary>
+        public int? ElevatorChannel { get; set; }
+
+        /// <summary>
+        /// 是否锁定
+        /// </summary>
+        public bool IsLock { get; set; }
+
+        /// <summary>
+        /// 库位状态  0-空闲 1-有货 2-锁定 3-禁用
+        /// </summary>
+        public StorageRackStatus Status
+        {
+            get
+            {
+                if (IsLock)
+                    return StorageRackStatus.Locked;
+                if (IsDisabled)
+                    return StorageRackStatus.Disabled;
+                if (!string.IsNullOrEmpty(BarCode))
+                    return StorageRackStatus.HaveGoods;
+
+                return StorageRackStatus.Empty;
+            }
+            set { }
+        }
+
+        /// <summary>
+        /// 库位名称
+        /// </summary>
+        public string StorageRackName { get; set; }
+
+        /// <summary>
+        /// 所在的库区排序
+        /// </summary>
+        public int AreaNumSort { get; set; }
+
+        /// <summary>
+        /// 库位排序(同一列的库位排序号越大越在里面（以车前进方向为准）)
+        /// </summary>
+        public int NumSort { get; set; }
+
+        /// <summary>
+        /// 所属库区
+        /// </summary>
+        public long? ReservoirAreaId { get; set; }
+
+        /// <summary>
+        /// 所属库区列（小车进入库位的方向为列）
+        /// </summary>
+        public long ReservoirAreaColumnId { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
+        /// <summary>
+        /// 所属楼层编号(10-一楼 20-二楼)
+        /// </summary>
+        public FloorEnum Floor { get; set; }
+
+        /// <summary>
+        /// AGV名称
+        /// </summary>
+        public string MachineName { get; set; }
+
+        /// <summary>
+        /// 确认时间
+        /// </summary>
+        public DateTime? ConfirmDate { get; set; }
+
+        /// <summary>
+        /// 是否禁用
+        /// </summary>
+        public bool IsDisabled { get; set; }
+
+        /// <summary>
+        /// 合格证号
+        /// </summary>
+        public string BarCode { get; set; }
+
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public string OrderNo { get; set; }
+
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        public string CustomName { get; set; }
+
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string MateriaName { get; set; }
+
+        /// <summary>
+        /// 物料类型
+        /// </summary>
+        public string MateriaType { get; set; }
+
+        /// <summary>
+        /// 单个托盘上的物料数量
+        /// </summary>
+        public int MateriaNum { get; set; }
+
+        /// <summary>
+        /// 批次号的生成规则为： 作业单号+日期+班次
+        /// </summary>
+        public string MateriaBatch { get; set; }
+
+        /// <summary>
+        /// 物料编码
+        /// </summary>
+        public string MateriaCode { get; set; }
+
+        /// <summary>
+        /// 联动线出口，机械手设备唯一号
+        /// </summary>
+        public string EquipmentNo { get; set; }
+
+        /// <summary>
+        /// 码头位置  1:北区  2:南区  3:人工  4:退货到车间  99:正常存储库位
+        /// </summary>
+        public TransportEnum Transport { get; set; }
+
+        /// <summary>
+        /// Erp回调Wms接口地址
+        /// </summary>
+        public string ErpCallWmsInterface { get; set; }
+
+        /// <summary>
+        /// Wms回调Erp接口地址
+        /// </summary>
+        public string WmsCallErpInterface { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreationTime { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? LastModifiedTime { get; set; }
+
+        /// <summary>
+        /// 清空物料
+        /// </summary>
+        public void ClearMaterial()
+        {
+            BarCode = null;
+            OrderNo = null;
+            CustomName = null;
+            MateriaName = null;
+            MateriaType = null;
+            MateriaNum = 0;
+            MateriaBatch = null;
+            MateriaCode = null;
+        }
+
+        /// <summary>
+        /// 是否空白可用库位
+        /// </summary>
+        /// <returns></returns>
+        public bool IsEmpty()
+        {
+            return !this.IsLock && !this.IsDisabled && string.IsNullOrEmpty(this.BarCode);
+        }
+
+        /// <summary>
+        /// 清空物料并解锁库位
+        /// </summary>
+        public void ClearMaterialAndUnLock()
+        {
+            ClearMaterial();
+
+            IsLock = false;
+        }
+
+        /// <summary>
+        /// 绑定物料信息
+        /// </summary>
+        public void BingdingMaterial(MateriaInfo materiaInfo)
+        {
+            BarCode = materiaInfo.BarCode;
+            OrderNo = materiaInfo.OrderNo;
+            MateriaName = materiaInfo.MateriaName;
+            MateriaType = materiaInfo.MateriaType;
+            MateriaNum = int.Parse(materiaInfo.MateriaNum);
+            MateriaBatch = materiaInfo.MateriaBatch;
+            MateriaCode = materiaInfo.MateriaCode;
+        }
+
+        /// <summary>
+        /// 绑定物料信息并锁定库位
+        /// </summary>
+        public void BingdingMaterialAndLock(MateriaInfo materiaInfo)
+        {
+            BingdingMaterial(materiaInfo);
+
+            IsLock = true;
+        }
+
+        public class StorageRackDtoIEqualityComparer : IEqualityComparer<StorageRackDto>
+        {
+            public bool Equals(StorageRackDto? x, StorageRackDto? y)
+            {
+                return x.StorageRackNo == y.StorageRackNo;
+            }
+
+            public int GetHashCode([DisallowNull] StorageRackDto obj)
+            {
+                return obj.StorageRackNo.GetHashCode();
+            }
+        }
+
+        public class MateriaInfo
+        {
+            /// <summary>
+            /// 合格证号
+            /// </summary>
+            public string BarCode { get; set; }
+
+            /// <summary>
+            /// 工单号
+            /// </summary>
+            public string OrderNo { get; set; }
+
+            /// <summary>
+            /// 物料名称
+            /// </summary>
+            public string MateriaName { get; set; }
+
+            /// <summary>
+            /// 物料类型       
+            /// </summary>
+            public string MateriaType { get; set; }
+
+            /// <summary>
+            /// 物料数量
+            /// </summary>
+            public string MateriaNum { get; set; }
+
+            /// <summary>
+            /// 批次号
+            /// </summary>
+            public string MateriaBatch { get; set; }
+
+            /// <summary>
+            /// 物料编码
+            /// </summary>
+            public string MateriaCode { get; set; }
+
+           
+        }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/UserInfoDto.cs

@@ -0,0 +1,30 @@
+using JSMachine.WMS.App.Dto;
+
+namespace JSMachine.WMS.App.Dto
+{
+    public class UserInfoDto : IRootDto
+    {
+        public Guid Id { get; set; }
+        /// <summary>
+        /// 账号
+        /// </summary>
+        public string UserId { get; set; }
+        /// <summary>
+        /// 用户名
+        /// </summary>
+        public string UserName { get; set; }
+        /// <summary>
+        /// 密码
+        /// </summary>
+        public string Password { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreationTime { get; set; }
+
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime? LastModifiedTime { get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/Dto/WantitErpUploadStatusDto.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.Dto
+{
+    /// <summary>
+    /// 企望Erp上传状态
+    /// </summary>
+    public partial class WantitErpUploadStatusDto
+    {
+        /// <summary>
+        /// 状态代码
+        /// </summary>
+        public int StatusCode { get; set; }
+
+        /// <summary>
+        /// 状态描述
+        /// </summary>
+        public string StatusDes { get; set; }
+    }
+}

wmsjst/JSMachine.WMS.Application/IService/IAGVTaskService.cs

@@ -0,0 +1,19 @@
+using JSMachine.WMS.App.Dto;
+using JSMachine.WMS.Domain.Entity;
+
+namespace JSMachine.WMS.App.IService
+{
+    /// <summary>
+    /// AGV 任务应用服务，负责任务数据的转换、持久化以及状态更新。
+    /// </summary>
+    public interface IAGVTaskService: IBaseService<AGVTaskDto, AGVTask>
+    {
+        /// <summary>
+        /// 仅更新 AGV 任务的状态和修改时间，避免覆盖任务的其他字段。
+        /// </summary>
+        /// <param name="agvTask">包含任务标识和目标状态的任务 DTO。</param>
+        /// <returns>数据库更新成功返回 <see langword="true"/>，否则返回 <see langword="false"/>。</returns>
+        public Task<bool> UpdateAgvTaskStatus(AGVTaskDto agvTask);
+
+    }
+}

wmsjst/JSMachine.WMS.Application/IService/IBaseService.cs

@@ -0,0 +1,330 @@
+using JSMachine.WMS.App.Dto;
+using JSMachine.WMS.Domain.Entity;
+using JSMachine.WMS.Domain.IRepository;
+using JSMachine.WMS.Domain.Repository;
+using SqlSugar;
+using System.Data;
+using System.Linq.Expressions;
+
+namespace JSMachine.WMS.App.IService
+{
+    public interface IBaseService<TDTO, TAggregateRoot>
+        where TAggregateRoot : AggregateRoot, IAggregateRoot
+        where TDTO : IRootDto
+    {
+        #region Add
+        /// <summary>
+        /// 添加单个实体
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <returns></returns>
+        Task<bool> Add(TDTO entity, SqlSugarScope sqlSugarScope=null);
+        /// <summary>
+        /// 添加单个实体
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <param name="ignoreColumns">要忽略的字段</param>
+        /// <returns></returns>
+        Task<bool> Add(TDTO dto, params string[] ignoreColumns);
+        /// <summary>
+        /// 批量插入实体
+        /// </summary>
+        /// <param name="entities"></param>
+        /// <returns></returns>
+        Task<bool> Add(List<TDTO> entities);
+
+        /// <summary>
+        /// 字典方式添加单个实体
+        /// </summary>
+        /// <param name="tableName">表名称</param>
+        /// <param name="dic"></param>
+        /// <returns></returns>
+        Task<bool> Add(string tableName, Dictionary<string, object> dic);
+        /// <summary>
+        /// 添加之前判断指定字段是否存在，不存在则添加
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="expression"></param>
+        /// <returns></returns>
+        Task<bool> AddIfNotExist(TDTO entity, Expression<Func<TDTO, bool>> expression);
+        #endregion
+
+        #region Delete
+        /// <summary>
+        /// 根据Id删除记录
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        Task<bool> DeleteById(Guid id, SqlSugarScope sqlSugarScope=null);
+
+        /// <summary>
+        /// 根据Id批量删除
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        Task<bool> DeleteBatch(Guid[] ids);
+
+        /// <summary>
+        /// 根据实体删除
+        /// </summary>
+        /// <param name="aggregateRoot"></param>
+        /// <returns></returns>
+        Task<bool> DeleteByEntity(TDTO aggregateRoot);
+        /// <summary>
+        /// 根据实体批量删除
+        /// </summary>
+        /// <param name="aggregateRoots"></param>
+        /// <returns>受影响行数不等于实体数量视为删除失败</returns>
+        Task<bool> DeleteByEntity(List<TDTO> aggregateRoot);
+
+        /// <summary>
+        /// 根据条件删除
+        /// </summary>
+        /// <param name="expression"></param>
+        /// <returns></returns>
+        Task<bool> DeleByExpression(Expression<Func<TAggregateRoot, bool>> expression);
+        #endregion
+
+        #region Edit
+        /// <summary>
+        /// 更改单个实体
+        /// </summary>
+        /// <param name="aggregateRoot"></param>
+        /// <returns></returns>
+        Task<bool> EditSingal(TDTO aggregateRoot);
+
+        /// <summary>
+        /// 更改单个实体但忽略指定的列
+        /// </summary>
+        /// <param name="aggregateRoot"></param>
+        /// <param name="ignoredColumns">忽略指定的条件</param>
+        /// <returns></returns>
+        Task<bool> EditSingal(TDTO aggregateRoot, Expression<Func<TDTO, object>> ignoredColumns);
+
+        /// <summary>
+        /// 更改单个实体但忽略指定的列
+        /// </summary>
+        /// <param name="aggregateRoot"></param>
+        /// <param name="ignoredColumns">要忽略的列名</param>
+        /// <returns></returns>
+        Task<bool> EditSingal(TDTO aggregateRoot, string[] ignoredColumns);
+
+        /// <summary>
+        /// 更改单个实体中指定的列
+        /// </summary>
+        /// <param name="aggregateRoot"></param>
+        /// <param name="columns">要更改的列名</param>
+        /// <returns></returns>
+        Task<bool> EditSingalWithSpecificCols(TDTO aggregateRoot, string[] columns);
+
+        /// <summary>
+        /// 批量更新
+        /// </summary>
+        /// <param name="aggregateRoots"></param>
+        /// <returns></returns>
+        Task<bool> EditBatch(List<TDTO> aggregateRoots);
+
+        /// <summary>
+        /// 快速批量更新
+        /// </summary>
+        /// <param name="aggregateRoots"></param>
+        /// <returns></returns>
+        Task<bool> EditBatchFast(List<TDTO> aggregateRoots);
+
+        /// <summary>
+        /// 字典方式更改
+        /// </summary>
+        /// <param name="tableName"></param>
+        /// <param name="dic"></param>
+        /// <returns></returns>
+        Task<bool> EditByDic(string tableName, Dictionary<string, object> dic);
+
+        /// <summary>
+        /// 字典方式批量更改
+        /// </summary>
+        /// <param name="tableName"></param>
+        /// <param name="dic"></param>
+        /// <returns></returns>
+        Task<bool> EditByDic(string tableName, List<Dictionary<string, object>> dic);
+        #endregion
+
+        #region Query
+        /// <summary>
+        /// 查询所有
+        /// </summary>
+        /// <returns></returns>
+        Task<List<TDTO>> GetAll();
+        /// <summary>
+        /// 查询所有
+        /// </summary>
+        /// <returns></returns>
+        Task<List<TDTO>> GetAll(string orderByFiled, OrderByType orderByType);
+        /// <summary>
+        /// 分片查询所有
+        /// </summary>
+        /// <param name="fragmentSize">分片大小，分片越大效率越高，但是占用的内存也越大，需要合理考虑数据量和硬件性能确定此参数大小</param>
+        /// <returns></returns>
+
+        Task<List<TDTO>> GetAllFragment(int fragmentSize = 50000);
+
+        /// <summary>
+        /// 分片查询所有(带排序功能)
+        /// </summary>
+        /// <param name="orderByFiled">要排序的字段</param>
+        /// <param name="orderByType">排序方式</param>
+        /// <param name="fragmentSize">分片大小，分片越大效率越高，但是占用的内存也越大，需要合理考虑数据量和硬件性能确定此参数大小</param>
+        /// <returns></returns>
+        Task<List<TDTO>> GetAllFragment(string orderByFiled, OrderByType orderByType, int fragmentSize = 200);
+
+        /// <summary>
+        /// 根据条件查询数量
+        /// </summary>
+        /// <param name="expression"></param>
+        /// <returns></returns>
+        Task<int> Count(Expression<Func<TDTO, bool>> expression);
+
+        /// <summary>
+        /// 根据主键查询
+        /// </summary>
+        /// <param name="key"></param>
+        /// <returns></returns>
+        Task<TDTO> QueryByKey(string key);
+
+        /// <summary>
+        /// 查询满足条件的第一个
+        /// </summary>
+        /// <param name="expression"></param>
+        /// <returns></returns>
+        Task<TDTO> GetSingalByExpression(Expression<Func<TDTO, bool>> expression);
+
+        /// <summary>
+        /// 查询满足条件的第一个(带排序)
+        /// </summary>
+        /// <param name="expression"></param>
+        /// <param name="orderByExpress"></param>
+        /// <param name="orderByType"></param>
+        /// <returns></returns>
+        Task<TDTO> GetSingalByExpression(
+            Expression<Func<TDTO, bool>> expression,
+            Expression<Func<TAggregateRoot, object>> orderByExpress,
+            OrderByType orderByType);
+
+        /// <summary>
+        /// 查询满足条件的所有实体
+        /// 注意 在oracle数据中时间段范围查询请使用 SqlFunc.Oracle_ToDate，可大幅提高查询速度
+        /// </summary>
+        /// <param name="aggregateRoot"></param>
+        /// <param name="expression"></param>
+        /// <returns></returns>
+        Task<List<TDTO>> GetListByExpression(Expression<Func<TDTO, bool>> expression);
+        /// <summary>
+        /// 查询满足条件的所有实体(带排序功能)
+        /// </summary>
+        /// <param name="expression"></param>
+        /// <param name="filedName"></param>
+        /// <param name="orderByType"></param>
+        /// <returns></returns>
+        Task<List<TDTO>> GetListByExpression(Expression<Func<TAggregateRoot, bool>> expression,
+             string filedName,
+             OrderByType orderByType = OrderByType.Desc);
+        
+        /// <summary>
+        /// 通过实体查询满足条件的数据
+        /// </summary>
+        /// <param name="aggregateRoot"></param>
+        /// <returns></returns>
+        Task<List<TDTO>> GetListWhereClass(TDTO dto);
+        /// <summary>
+        /// 分页查询
+        /// </summary>
+        /// <param name="pageIndex">当前页码</param>
+        /// <param name="pageSize"></param>
+        /// <param name="totalCount">总记录条数</param>
+        /// <param name="expression">查询条件</param>
+        /// <returns></returns>
+        Task<PagedResult<TDTO>> QueryByPage(PageQueryCondition commonQueryCondition);
+
+        /// <summary>
+        /// 根据主键批量查询
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <returns></returns>
+        Task<List<TDTO>> QueryByIds(Guid[] ids);
+
+        /// <summary>
+        /// 是否存在
+        /// </summary>
+        /// <param name="expression"></param>
+        /// <returns></returns>
+        Task<bool> Exist(Expression<Func<TDTO, bool>> expression);
+        #endregion
+
+        #region RawSql Sql操作
+        /// <summary>
+        /// sql查询，不带参数
+        /// </summary>
+        /// <param name="sql"></param>
+        /// <returns></returns>
+        Task<List<TDTO>> GetBySql(string sql);
+        /// <summary>
+        /// sql查询，带参数 参数示例 select * from table where id=@id and name=@name  则字典的key为 "@id"
+        /// </summary>
+        /// <param name="sql"></param>
+        /// <param name="sqlParam"></param>
+        /// <returns></returns>
+        Task<List<TDTO>> GetBySql(string sql, Dictionary<string, object> sqlParam);
+        /// <summary>
+        /// sql查询匿名类型
+        /// </summary>
+        /// <param name="sql"></param>
+        /// <returns></returns>
+        Task<List<dynamic>> GetDynamicsBysql(string sql);
+        /// <summary>
+        /// sql查询匿名类型，附带参数 参数示例 select * from table where id=@id and name=@name  则字典的key为 "@id"
+        /// </summary>
+        /// <param name="sql"></param>
+        /// <param name="sqlParam"></param>
+        /// <returns></returns>
+        Task<List<dynamic>> GetDynamicsBysql(string sql, Dictionary<string, object> sqlParam);
+        /// <summary>
+        /// 通过sql查询DataTable
+        /// </summary>
+        /// <param name="sql"></param>
+        /// <returns></returns>
+        Task<DataTable> GetDataTableBysql(string sql);
+        /// <summary>
+        /// 通过sql查询DataTable, 参数示例 select * from table where id=@id and name=@name  则字典的key为 "@id"
+        /// </summary>
+        /// <param name="sql"></param>
+        /// <param name="sqlParam"></param>
+        /// <returns></returns>
+        Task<DataTable> GetDataTableBysql(string sql, Dictionary<string, object> sqlParam);
+        /// <summary>
+        /// 执行原生sql
+        /// </summary>
+        /// <param name="sql"></param>
+        /// <param name="params"></param>
+        /// <returns></returns>
+        Task<bool> ExcuteSql(string sql, params SugarParameter[] @params);
+        #endregion
+
+        #region 事务
+        /// <summary>
+        /// 开始事务
+        /// </summary>
+        /// <returns></returns>
+        Task BeginTran(SqlSugarScope sqlSugarScope);
+        /// <summary>
+        /// 提交事务
+        /// </summary>
+        /// <returns></returns>
+        Task CommitTran(SqlSugarScope sqlSugarScope);
+        /// <summary>
+        /// 回滚事务
+        /// </summary>
+        /// <returns></returns>
+        Task RollbackTran(SqlSugarScope sqlSugarScope);
+        SqlSugarTransaction UseTranAsync();
+        #endregion
+    }
+}

wmsjst/JSMachine.WMS.Application/IService/IERPTaskService.cs

@@ -0,0 +1,23 @@
+using JSMachine.WMS.App.Dto;
+using JSMachine.WMS.Domain.Entity;
+
+namespace JSMachine.WMS.App.IService
+{
+    public interface IERPTaskService: IBaseService<ERPTaskDto, ERPTask>
+    {
+        /// <summary>
+        /// 更新任务消息(生成失败提示等)
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="taskMsg"></param>
+        /// <returns></returns>
+        Task<bool> UpdateTaskMsg(Guid id, string taskMsg);
+
+        /// <summary>
+        /// 更新任务状态(已完成、取消等)
+        /// </summary>
+        /// <param name="erpTask"></param>
+        /// <returns></returns>
+        Task<bool> UpdateTaskStatus(ERPTaskDto erpTask);
+    }
+}

wmsjst/JSMachine.WMS.Application/IService/IElevatorCountService.cs

@@ -0,0 +1,22 @@
+using JSMachine.WMS.App.Dto;
+using JSMachine.WMS.App.ServiceImpl;
+using JSMachine.WMS.Domain.Entity;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.IService
+{
+    public interface IElevatorCountService : IBaseService<ElevatorCountDto, ElevatorCount>
+    {
+        /// <summary>
+        /// 计数自增
+        /// </summary>
+        /// <param name="elevatorNo"></param>
+        /// <param name="channel"></param>
+        /// <returns></returns>
+        Task IncrementCount(int elevatorNo, int channel);
+    }
+}

wmsjst/JSMachine.WMS.Application/IService/IElevatorPlcQueueService.cs

@@ -0,0 +1,11 @@
+using JSMachine.WMS.App.Dto;
+using JSMachine.WMS.App.Dto.Enum;
+using JSMachine.WMS.Domain.Entity;
+
+namespace JSMachine.WMS.App.IService
+{
+    public interface IElevatorPlcQueueService : IBaseService<ElevatorPlcQueueDto, ElevatorPlcQueue>
+    {
+        
+    }
+}

wmsjst/JSMachine.WMS.Application/IService/IOperationLogService.cs

@@ -0,0 +1,11 @@
+using JSMachine.WMS.App.IService;
+using JSMachine.WMS.Application.Dto;
+using JSMachine.WMS.Domain.Entity;
+
+namespace JSMachine.WMS.Application.IService
+{
+    public interface IOperationLogService : IBaseService<OperationLogDto, OperationLog>
+    {
+        // 可根据业务需求添加自定义方法
+    }
+}

wmsjst/JSMachine.WMS.Application/IService/IRcsTaskService.cs

@@ -0,0 +1,9 @@
+using JSMachine.WMS.App.Dto;
+using JSMachine.WMS.Domain.Entity;
+
+namespace JSMachine.WMS.App.IService
+{
+    public interface IRcsTaskService : IBaseService<RcsTaskDto, RcsTask>
+    {
+    }
+}

wmsjst/JSMachine.WMS.Application/IService/IStorageRackService.cs

@@ -0,0 +1,67 @@
+using JSMachine.WMS.App.Dto;
+using JSMachine.WMS.App.Dto.Enum;
+using JSMachine.WMS.Domain.Entity;
+
+namespace JSMachine.WMS.App.IService
+{
+    public interface IStorageRackService : IBaseService<StorageRackDto, StorageRack>
+    {
+        /// <summary>
+        /// 根据库位号查询库位信息
+        /// </summary>
+        /// <param name="storageRackNo"></param>
+        /// <returns></returns>
+        Task<StorageRackDto> GetByStorageRackNo(string storageRackNo);
+        /// <summary>
+        /// 根据提升机编号和通道号获取提所属库位信息
+        /// </summary>
+        /// <param name="elevatorNo"></param>
+        /// <param name="channel"></param>
+        /// <returns></returns>
+        Task<StorageRackDto> GetElevatorWareHouse(int elevatorNo,int channel);
+        /// <summary>
+        /// 获取可用的提升机库位
+        /// </summary>
+        /// <param name="floor"></param>
+        /// <returns></returns>
+        Task<List<StorageRackDto>> GetUsableElevatorWareHouse(FloorEnum floor);
+        /// <summary>
+        /// 锁定库位
+        /// </summary>
+        /// <param name="storageRack"></param>
+        /// <returns></returns>
+        Task<bool> Lock(StorageRackDto storageRack);
+        /// <summary>
+        /// 解锁库位
+        /// </summary>
+        /// <param name="storageRack"></param>
+        /// <returns></returns>
+        Task<bool> Unlock(StorageRackDto storageRack);
+        /// <summary>
+        /// 更新锁定状态
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="isLock"></param>
+        /// <returns></returns>
+        Task<bool> UpdateLockStatus(Guid id, bool isLock);
+        /// <summary>
+        /// 更新禁用状态
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="isDisable"></param>
+        /// <returns></returns>
+        Task<bool> UpdateDisableStatus(Guid id, bool isDisable);
+        /// <summary>
+        /// 预计算可用库位数量(用于pda入库请求时预计算可用库位数量,防止入库时找不到可用库位)
+        /// </summary>
+        /// <param name="floor"></param>
+        /// <returns></returns>
+        //Task<int> PreCalUsableStorageRackCount(FloorEnum floor);
+        
+        /// <summary>
+        /// 获取可用的中转库位
+        /// </summary>
+        /// <returns></returns>
+        Task<StorageRackDto> GetUsableTransferStorageRack();
+    }
+}

wmsjst/JSMachine.WMS.Application/IService/IUserInfoService.cs

@@ -0,0 +1,10 @@
+using JSMachine.WMS.App.Dto;
+using JSMachine.WMS.Domain.Entity;
+
+namespace JSMachine.WMS.App.IService
+{
+    public interface IUserInfoService : IBaseService<UserInfoDto, UserInfo>
+    {
+        // 可以在这里添加UserInfo特有的方法
+    }
+}

wmsjst/JSMachine.WMS.Application/JSMachine.WMS.App.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <Platforms>AnyCPU;x64</Platforms>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Prism.Core" Version="8.1.97" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\JSMachine.WMS.Domain\JSMachine.WMS.Domain.csproj" />
+  </ItemGroup>
+
+</Project>

wmsjst/JSMachine.WMS.Application/ServiceImpl/AGVTaskService.cs

@@ -0,0 +1,21 @@
+using JSMachine.WMS.App.Dto;
+using JSMachine.WMS.App.IService;
+using JSMachine.WMS.Domain.Entity;
+using JSMachine.WMS.Domain.IRepository;
+
+namespace JSMachine.WMS.App.ServiceImpl
+{
+    public class AGVTaskService : BaseService<AGVTaskDto, AGVTask>, IAGVTaskService
+    {
+        private IAGVTaskRepository _agvTaskRepository;
+        public AGVTaskService(IAGVTaskRepository repository) : base(repository)
+        {
+            _agvTaskRepository = repository;
+        }
+
+        public async Task<bool> UpdateAgvTaskStatus(AGVTaskDto agvTask)
+        {
+            return await base.EditSingalWithSpecificCols(agvTask, [nameof(AGVTask.TaskStatus)]);
+        }
+    }
+}

wmsjst/JSMachine.WMS.Application/ServiceImpl/BaseService.cs

@@ -0,0 +1,360 @@
+using AutoMapper;
+using JSMachine.WMS.App.Dto;
+using JSMachine.WMS.App.IService;
+using JSMachine.WMS.Domain.Entity;
+using JSMachine.WMS.Domain.IRepository;
+using JSMachine.WMS.Domain.Repository;
+using JSMachine.WMS.Infrastructure;
+using JSMachine.WMS.Infrastructure.LambdaHelp;
+using SqlSugar;
+using System.Data;
+using System.Linq.Expressions;
+
+namespace JSMachine.WMS.App.ServiceImpl
+{
+    /// <summary>
+    /// 应用层通用服务基类，负责 DTO 与领域实体之间的映射，
+    /// 并将增删改查请求委托给对应的领域仓储。
+    /// </summary>
+    /// <typeparam name="TDTO">应用层数据传输对象类型。</typeparam>
+    /// <typeparam name="TAggregateRoot">领域聚合根类型。</typeparam>
+    public class BaseService<TDTO, TAggregateRoot> : IBaseService<TDTO, TAggregateRoot>
+        where TAggregateRoot : AggregateRoot, IAggregateRoot
+        where TDTO : IRootDto
+    {
+        private IBaseRepository<TAggregateRoot> IBaseRepository;
+        private static IMapper _mapper = GlobalServericeProvidor.GetService<IMapper>();
+        public BaseService(IBaseRepository<TAggregateRoot> baseRepository)
+        {
+            IBaseRepository = baseRepository;
+        }
+
+        /// <summary>
+        /// 添加单个 DTO；当 DTO 未提供标识时生成新标识，并维护创建时间和修改时间。
+        /// </summary>
+        /// <param name="dto">待保存的数据传输对象。</param>
+        /// <param name="sqlSugarScope">可选的数据库作用域；为空时使用仓储默认作用域。</param>
+        /// <returns>数据库插入是否成功。</returns>
+        public async virtual Task<bool> Add(TDTO dto, SqlSugarScope sqlSugarScope=null)
+        {
+            if (dto.Id == Guid.Empty)
+                dto.Id = Guid.NewGuid();
+            dto.CreationTime = DateTime.Now;
+            dto.LastModifiedTime = DateTime.Now;
+
+            return await IBaseRepository.Add(_mapper.Map<TAggregateRoot>(dto),sqlSugarScope);
+        }
+
+        public async virtual Task<bool> Add(TDTO dto, params string[] ignoreColumns)
+        {
+            if (dto.Id == Guid.Empty)
+                dto.Id = Guid.NewGuid();
+            dto.CreationTime = DateTime.Now;
+            dto.LastModifiedTime = DateTime.Now;
+
+            return await IBaseRepository.Add(_mapper.Map<TAggregateRoot>(dto), ignoreColumns);
+        }
+
+        public async virtual Task<bool> Add(List<TDTO> entities)
+        {
+            if (entities == null || entities.Count == 0)
+                return false;
+
+            entities.ForEach(p =>
+            {
+
+                if (p.Id == Guid.Empty)
+                    p.Id = Guid.NewGuid();
+
+                p.CreationTime = DateTime.Now;
+                p.LastModifiedTime = DateTime.Now;
+            });
+
+            return await IBaseRepository.Add(_mapper.Map<List<TAggregateRoot>>(entities));
+        }
+
+        public async Task<bool> Add(string tableName, Dictionary<string, object> dic)
+        {
+            if (dic.ContainsKey("Id"))
+                dic.Add("Id", Guid.NewGuid().ToString("N"));
+
+            return await IBaseRepository.Add(tableName, dic);
+        }
+
+        /// <summary>
+        /// 添加之前判断指定字段是否存在，不存在则添加
+        /// </summary>
+        /// <param name="entity"></param>
+        /// <param name="expression"></param>
+        /// <returns></returns>
+        public async Task<bool> AddIfNotExist(TDTO entity, Expression<Func<TDTO, bool>> expression)
+        {
+            return await IBaseRepository.AddIfNotExist(_mapper.Map<TAggregateRoot>(entity),
+                _mapper.Map<Expression<Func<TAggregateRoot, bool>>>(expression));
+        }
+
+        public async Task<int> Count()
+        {
+            return await IBaseRepository.Count();
+        }
+
+        public async Task<int> Count(Expression<Func<TDTO, bool>> expression)
+        {
+            return await IBaseRepository.Count(_mapper.Map<Expression<Func<TAggregateRoot, bool>>>(expression));
+        }
+
+        public async Task<bool> DeleByExpression(Expression<Func<TAggregateRoot, bool>> expression)
+        {
+            return await IBaseRepository.DeleByExpression(expression);
+        }
+
+        public async Task<bool> DeleteBatch(Guid[] ids)
+        {
+            return await IBaseRepository.DeleteBatch(ids);
+        }
+
+        public async Task<bool> DeleteByEntity(TDTO aggregateRoot)
+        {
+            return await IBaseRepository.DeleteByEntity(_mapper.Map<TAggregateRoot>(aggregateRoot));
+        }
+
+        public async Task<bool> DeleteByEntity(List<TDTO> aggregateRoot)
+        {
+            return await IBaseRepository.DeleteByEntity(_mapper.Map<List<TAggregateRoot>>(aggregateRoot));
+        }
+
+        public async Task<bool> DeleteById(Guid id, SqlSugarScope sqlSugarScope=null)
+        {
+            return await IBaseRepository.DeleteById(id,sqlSugarScope);
+        }
+
+        public async Task<bool> EditBatch(List<TDTO> dtos)
+        {
+            dtos.ForEach(p => p.LastModifiedTime = DateTime.Now);
+
+            return await IBaseRepository.EditBatch(_mapper.Map<List<TAggregateRoot>>(dtos));
+        }
+
+        /// <summary>
+        /// 快速批量更新
+        /// </summary>
+        /// <param name="dtos"></param>
+        /// <returns></returns>
+        public async Task<bool> EditBatchFast(List<TDTO> dtos)
+        {
+            dtos.ForEach(p => p.LastModifiedTime = DateTime.Now);
+            return await IBaseRepository.EditBatchFast(_mapper.Map<List<TAggregateRoot>>(dtos));
+        }
+
+        public async Task<bool> EditByDic(string tableName, Dictionary<string, object> dic)
+        {
+            return await IBaseRepository.EditByDic(tableName, dic);
+        }
+
+        public async Task<bool> EditByDic(string tableName, List<Dictionary<string, object>> dic)
+        {
+            return await IBaseRepository.EditByDic(tableName, dic);
+        }
+
+        public async virtual Task<bool> EditSingal(TDTO aggregateRoot)
+        {
+            aggregateRoot.LastModifiedTime = DateTime.Now;
+
+            //更新的时候不能够更改数据的添加时间
+            return await IBaseRepository.EditSingal(_mapper.Map<TAggregateRoot>(aggregateRoot), new string[] { "CreationTime" });
+        }
+
+        public async Task<bool> EditSingal(TDTO dto, Expression<Func<TDTO, object>> ignoredColumns)
+        {
+            dto.LastModifiedTime = DateTime.Now;
+            return await IBaseRepository.EditSingal(_mapper.Map<TAggregateRoot>(dto), _mapper.Map<Expression<Func<TAggregateRoot, object>>>(ignoredColumns));
+        }
+
+        public async Task<bool> EditSingal(TDTO dto, string[] ignoredColumns)
+        {
+            dto.LastModifiedTime = DateTime.Now;
+            return await IBaseRepository.EditSingal(_mapper.Map<TAggregateRoot>(dto), ignoredColumns);
+        }
+
+        public async Task<bool> EditSingalWithSpecificCols(TDTO dto, string[] columns)
+        {
+            dto.LastModifiedTime = DateTime.Now;
+            return await IBaseRepository.EditSingalWithSpecificCols(_mapper.Map<TAggregateRoot>(dto), columns);
+        }
+
+        public async Task<bool> Exist(Expression<Func<TDTO, bool>> expression)
+        {
+            return await IBaseRepository.Exist(_mapper.Map<Expression<Func<TAggregateRoot, bool>>>(expression));
+        }
+
+        public async Task<List<TDTO>> GetAll()
+        {
+            List<TAggregateRoot> data = await IBaseRepository.GetAll();
+
+            return _mapper.Map<List<TDTO>>(data);
+        }
+
+        public async Task<List<TDTO>> GetAll(string orderByFiled, OrderByType orderByType)
+        {
+            List<TAggregateRoot> data = await IBaseRepository.GetAll(LambdaHelper<TAggregateRoot>.GetOrderExpression<object>(orderByFiled),
+                orderByType);
+
+            return _mapper.Map<List<TDTO>>(data);
+        }
+
+        public async Task<List<TDTO>> GetAllFragment(int fragmentSize = 50000)
+        {
+            List<TAggregateRoot> data = await IBaseRepository.GetAllFragment(fragmentSize);
+
+            return _mapper.Map<List<TDTO>>(data);
+        }
+
+        public async Task<List<TDTO>> GetAllFragment(string orderByFiled, OrderByType orderByType, int fragmentSize = 200)
+        {
+            List<TAggregateRoot> data = await IBaseRepository.GetAllFragment(
+                LambdaHelper<TAggregateRoot>.GetOrderExpression<object>(orderByFiled),
+                orderByType,
+                fragmentSize);
+            return _mapper.Map<List<TDTO>>(data);
+        }
+
+        public async Task<List<TDTO>> GetBySql(string sql)
+        {
+            List<TAggregateRoot> data = await IBaseRepository.GetBySql(sql);
+            return _mapper.Map<List<TDTO>>(data);
+        }
+
+        public async Task<List<TDTO>> GetBySql(string sql, Dictionary<string, object> sqlParam)
+        {
+            List<TAggregateRoot> data = await IBaseRepository.GetBySql(sql, sqlParam);
+            return _mapper.Map<List<TDTO>>(data);
+        }
+
+        public async Task<DataTable> GetDataTableBysql(string sql)
+        {
+            return await IBaseRepository.GetDataTableBysql(sql);
+        }
+
+        public async Task<DataTable> GetDataTableBysql(string sql, Dictionary<string, object> sqlParam)
+        {
+            return await IBaseRepository.GetDataTableBysql(sql, sqlParam);
+        }
+
+        public async Task<List<dynamic>> GetDynamicsBysql(string sql)
+        {
+            return await IBaseRepository.GetDynamicsBysql(sql);
+        }
+
+        public async Task<List<dynamic>> GetDynamicsBysql(string sql, Dictionary<string, object> sqlParam)
+        {
+            return await IBaseRepository.GetDynamicsBysql(sql, sqlParam);
+        }
+
+        public async Task<List<TDTO>> GetListByExpression(Expression<Func<TDTO, bool>> expression)
+        {
+            List<TAggregateRoot> data = await IBaseRepository.GetListByExpression(
+                    _mapper.Map<Expression<Func<TAggregateRoot, bool>>>(expression));
+
+            return _mapper.Map<List<TDTO>>(data);
+        }
+
+        /// <summary>
+        /// 查询满足条件的所有实体(带排序功能)
+        /// </summary>
+        /// <param name="expression"></param>
+        /// <param name="orderByExpress"></param>
+        /// <param name="orderByType">Asc = 0,Desc = 1</param>
+        /// <returns></returns>
+        public async Task<List<TDTO>> GetListByExpression(Expression<Func<TAggregateRoot, bool>> expression,
+             string filedName,
+             OrderByType orderByType = OrderByType.Desc)
+        {
+            List<TAggregateRoot> data = await IBaseRepository.GetListByExpression(
+                    _mapper.Map<Expression<Func<TAggregateRoot, bool>>>(expression),
+                    filedName,
+                    orderByType);
+
+            return _mapper.Map<List<TDTO>>(data);
+        }
+
+        /// <summary>
+        /// 通过实体查询满足条件的数据
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        public async Task<List<TDTO>> GetListWhereClass(TDTO dto)
+        {
+            List<TAggregateRoot> data = await IBaseRepository.GetListWhereClass(
+                    _mapper.Map<TAggregateRoot>(dto));
+            return _mapper.Map<List<TDTO>>(data);
+        }
+
+        public async Task<TDTO> GetSingalByExpression(Expression<Func<TDTO, bool>> expression)
+        {
+            TAggregateRoot data = await IBaseRepository.GetSingalByExpression(
+                    _mapper.Map<Expression<Func<TAggregateRoot, bool>>>(expression));
+
+            return _mapper.Map<TDTO>(data);
+        }
+
+        public async Task<TDTO> GetSingalByExpression(
+            Expression<Func<TDTO, bool>> expression,
+            Expression<Func<TAggregateRoot, object>> orderByExpress,
+            OrderByType orderByType)
+        {
+            TAggregateRoot data = await IBaseRepository.GetSingalByExpression(
+                   _mapper.Map<Expression<Func<TAggregateRoot, bool>>>(expression), orderByExpress, orderByType);
+
+            return _mapper.Map<TDTO>(data);
+        }
+
+        public async Task<List<TDTO>> QueryByIds(Guid[] ids)
+        {
+            List<TAggregateRoot> data = await IBaseRepository.QueryByIds(ids);
+            return _mapper.Map<List<TDTO>>(data);
+        }
+
+        public async Task<TDTO> QueryByKey(string key)
+        {
+            TAggregateRoot data = await IBaseRepository.QueryByKey(key);
+            return _mapper.Map<TDTO>(data);
+        }
+
+        public async Task<PagedResult<TDTO>> QueryByPage(PageQueryCondition pageQueryCondition)
+        {
+            PagedResult<TAggregateRoot> dataPage = await IBaseRepository.QueryByPage(pageQueryCondition);
+
+            return new PagedResult<TDTO>(dataPage.TotalRecords,
+                dataPage.PageSize,
+                dataPage.PageNumber,
+                _mapper.Map<List<TDTO>>(dataPage.PageData));
+        }
+
+        public async Task<bool> ExcuteSql(string sql, params SugarParameter[] @params)
+        {
+            return await IBaseRepository.ExcuteSql(sql, @params);
+        }
+
+        #region 事务操作
+        public async Task BeginTran(SqlSugarScope sqlSugarScope)
+        {
+            await IBaseRepository.BeginTran(sqlSugarScope);
+        }
+
+        public async Task CommitTran(SqlSugarScope sqlSugarScope)
+        {
+            await IBaseRepository.CommitTran(sqlSugarScope);
+        }
+
+        public async Task RollbackTran(SqlSugarScope sqlSugarScope)
+        {
+            await IBaseRepository.RollbackTran(sqlSugarScope);
+        }
+
+        public SqlSugarTransaction UseTranAsync()
+        {
+            return IBaseRepository.UseTranAsync();
+        }
+        #endregion
+    }
+}

wmsjst/JSMachine.WMS.Application/ServiceImpl/ERPTaskService.cs

@@ -0,0 +1,32 @@
+using JSMachine.WMS.App.Dto;
+using JSMachine.WMS.App.IService;
+using JSMachine.WMS.Domain.Entity;
+using JSMachine.WMS.Domain.IRepository;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.ServiceImpl
+{
+    public class ERPTaskService : BaseService<ERPTaskDto, ERPTask>, IERPTaskService
+    {
+        private IERPTaskRepository _erpTaskRepository;
+        public ERPTaskService(IERPTaskRepository repository) : base(repository)
+        {
+            _erpTaskRepository = repository;
+        }
+
+        public Task<bool> UpdateTaskMsg(Guid id, string taskMsg)
+        {
+            return _erpTaskRepository.ExcuteSql($"update ERPTask set TaskMsg='{taskMsg}' where Id='{id}'");
+        }
+
+        public Task<bool> UpdateTaskStatus(ERPTaskDto erpTask)
+        {
+            erpTask.LastModifiedTime = DateTime.Now;
+            return base.EditSingalWithSpecificCols(erpTask, [nameof(ERPTaskDto.TaskStatus), nameof(ERPTaskDto.LastModifiedTime)]);
+        }
+    }
+}

wmsjst/JSMachine.WMS.Application/ServiceImpl/ElevatorCountService.cs

@@ -0,0 +1,49 @@
+using JSMachine.WMS.App.Dto;
+using JSMachine.WMS.App.IService;
+using JSMachine.WMS.Domain.Entity;
+using JSMachine.WMS.Domain.IRepository;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.ServiceImpl
+{
+    public class ElevatorCountService : BaseService<ElevatorCountDto, ElevatorCount>, IElevatorCountService
+    {
+        public ElevatorCountService(IBaseRepository<ElevatorCount> baseRepository) : base(baseRepository)
+        {
+        }
+
+        /// <summary>
+        /// 计数自增
+        /// </summary>
+        /// <param name="elevatorNo"></param>
+        /// <param name="channel"></param>
+        /// <returns></returns>
+        public async Task IncrementCount(int elevatorNo, int channel)
+        {
+            ElevatorCountDto elevatorCount = await GetSingalByExpression(p =>
+                p.CreationTime >= DateTime.Now.Date &&
+                p.ElevatorNo == elevatorNo &&
+                p.ElevatorChannel == channel);
+            if (elevatorCount == null)
+            {
+                elevatorCount = new()
+                {
+                    ElevatorNo = elevatorNo,
+                    ElevatorChannel = channel,
+                    Count = 1
+                };
+
+                await Add(elevatorCount);
+            }
+            else
+            {
+                elevatorCount.Count++;
+                await EditSingal(elevatorCount);
+            }
+        }
+    }
+}

wmsjst/JSMachine.WMS.Application/ServiceImpl/ElevatorPlcQueueService.cs

@@ -0,0 +1,18 @@
+using JSMachine.WMS.App.Dto;
+using JSMachine.WMS.App.Dto.Enum;
+using JSMachine.WMS.App.IService;
+using JSMachine.WMS.Domain.Entity;
+using JSMachine.WMS.Domain.IRepository;
+using JSMachine.WMS.Infrastructure.Helper;
+
+namespace JSMachine.WMS.App.ServiceImpl
+{
+    public class ElevatorPlcQueueService : BaseService<ElevatorPlcQueueDto, ElevatorPlcQueue>, IElevatorPlcQueueService
+    {
+        private IElevatorPlcQueueRepository _elevatorPlcQueueRepository;
+        public ElevatorPlcQueueService(IElevatorPlcQueueRepository repository) : base(repository)
+        {
+            _elevatorPlcQueueRepository = repository;
+        }
+    }
+}

wmsjst/JSMachine.WMS.Application/ServiceImpl/OperationLogService.cs

@@ -0,0 +1,20 @@
+using JSMachine.WMS.App.ServiceImpl;
+using JSMachine.WMS.Application.Dto;
+using JSMachine.WMS.Application.IService;
+using JSMachine.WMS.Domain.Entity;
+using JSMachine.WMS.Domain.IRepository;
+
+namespace JSMachine.WMS.Application.ServiceImpl
+{
+    public class OperationLogService : BaseService<OperationLogDto, OperationLog>, IOperationLogService
+    {
+        private readonly IOperationLogRepository _operationLogRepository;
+        
+        public OperationLogService(IOperationLogRepository repository) : base(repository)
+        {
+            _operationLogRepository = repository;
+        }
+        
+        // 可根据业务需求添加自定义操作方法
+    }
+}

wmsjst/JSMachine.WMS.Application/ServiceImpl/RcsTaskService.cs

@@ -0,0 +1,21 @@
+using JSMachine.WMS.App.Dto;
+using JSMachine.WMS.App.IService;
+using JSMachine.WMS.Domain.Entity;
+using JSMachine.WMS.Domain.IRepository;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace JSMachine.WMS.App.ServiceImpl
+{
+    public class RcsTaskService : BaseService<RcsTaskDto, RcsTask>, IRcsTaskService
+    {
+        private IRcsTaskRepository _rcsTaskRepository;
+        public RcsTaskService(IRcsTaskRepository rcsTaskRepository) : base(rcsTaskRepository)
+        {
+            _rcsTaskRepository = rcsTaskRepository;
+        }
+    }
+}

wmsjst/JSMachine.WMS.Application/ServiceImpl/StorageRackService.cs

@@ -0,0 +1,215 @@
+using JSMachine.WMS.App.Dto;
+using JSMachine.WMS.App.Dto.Enum;
+using JSMachine.WMS.App.IService;
+using JSMachine.WMS.Domain.Entity;
+using JSMachine.WMS.Domain.IRepository;
+using JSMachine.WMS.Infrastructure;
+using JSMachine.WMS.Infrastructure.Helper;
+using SqlSugar;
+using static JSMachine.WMS.App.Dto.StorageRackDto;
+
+namespace JSMachine.WMS.App.ServiceImpl
+{
+    public class StorageRackService : BaseService<StorageRackDto, StorageRack>, IStorageRackService
+    {
+        private IStorageRackRepository _storageRackRepository;
+        public StorageRackService(IStorageRackRepository repository) : base(repository)
+        {
+            _storageRackRepository = repository;
+        }
+
+        /// <summary>
+        /// 根据库位号查询库位信息
+        /// </summary>
+        /// <param name="storageRackNo"></param>
+        /// <returns></returns>
+        public async Task<StorageRackDto> GetByStorageRackNo(string storageRackNo)
+        {
+            return await GetSingalByExpression(p => p.StorageRackNo == storageRackNo);
+        }
+
+        /// <summary>
+        /// 根据批次号计算目标存储区库位
+        /// </summary>
+        /// <param name="materiaBatch"></param>
+        /// <returns></returns>
+        //public async Task<StorageRackDto> CalculateDestWarehouse(string materiaBatch, FloorEnum floor)
+        //{
+        //    //如果某一列有一个库位被锁定，说明该列有未完成的任务(任务完成会解锁库位)，因此该列不可以再生成新的任务
+
+        //    //获取楼层的所有库位
+        //    List<StorageRackDto> wareHouses = await GetListByExpression(p =>
+        //                                                                p.Floor == floor && p.Transport == TransportEnum.NormalArea);
+
+        //    if (wareHouses.IsNullOrEmpty())
+        //    {
+        //        LogHelper.Warn($"{floor} 层没有空余库位");
+        //        return null;
+        //    }
+
+        //    wareHouses = wareHouses.OrderBy(p => p.AreaNumSort).OrderBy(p => p.ReservoirAreaColumnId).ToList();
+
+        //    List<StorageRackDto> sameBatchWarehouses = wareHouses.Where(p => p.MateriaBatch == materiaBatch).ToList();
+        //    StorageRackDto destStorageRack = null;
+
+        //    //没有相同批次则任选一个空白的列
+        //    if (sameBatchWarehouses.IsNullOrEmpty())
+        //    {
+        //        var groupByColumn = wareHouses.GroupBy(p => p.ReservoirAreaColumnId);
+
+        //        foreach (var columnGroup in groupByColumn)
+        //        {
+        //            bool emptyColumn = columnGroup.All(p => !p.IsLock && !p.IsDisabled && string.IsNullOrEmpty(p.BarCode));
+        //            if (emptyColumn)
+        //            {
+        //                destStorageRack = columnGroup.OrderByDescending(p => p.NumSort).First();
+        //                break;
+
+        //            }
+        //        }
+        //    }
+        //    else //存在相同批次则搜寻该批次所在的列下是否还有空库位
+        //    {
+        //        foreach (StorageRackDto sameBatchWarehous in sameBatchWarehouses)
+        //        {
+        //            var sameColumnWarehouse = wareHouses.Where(p => p.ReservoirAreaColumnId == sameBatchWarehous.ReservoirAreaColumnId);
+        //            //同批次的列中也不能有任何库位被锁定
+        //            if (sameColumnWarehouse.All(p => !p.IsLock && !p.IsDisabled))
+        //            {
+        //                destStorageRack = sameColumnWarehouse
+        //                    .OrderByDescending(p => p.NumSort)
+        //                    .FirstOrDefault(p => string.IsNullOrEmpty(p.BarCode));
+
+        //                if (destStorageRack != null)
+        //                    break;
+        //            }
+        //        }
+
+        //        //如果同批次下都没有合适的库位，则需要找空列
+        //        if (destStorageRack == null)
+        //        {
+        //            List<StorageRackDto> remain = wareHouses.Except(sameBatchWarehouses, new StorageRackDtoIEqualityComparer()).ToList();
+        //            if (remain.IsNullOrEmpty())
+        //            {
+        //                LogHelper.Warn("排除相同批次库位后没有剩余可用库位");
+
+        //                return null;
+        //            }
+
+        //            var groupByColumn = remain.GroupBy(p => p.ReservoirAreaColumnId);
+
+        //            foreach (var columnGroup in groupByColumn)
+        //            {
+        //                bool emptyColumn = columnGroup.All(p => !p.IsLock && !p.IsDisabled && string.IsNullOrEmpty(p.BarCode));
+        //                if (emptyColumn)
+        //                {
+        //                    destStorageRack = columnGroup.OrderByDescending(p => p.NumSort).First();
+        //                    break;
+        //                }
+        //            }
+        //        }
+
+        //    }
+        //    return destStorageRack;
+        //}
+
+
+        /// <summary>
+        /// 根据批次号判断是否存在空余库位
+        /// </summary>
+        /// <param name="materialBatch"></param>
+        /// <returns></returns>
+        //public async Task<bool> HasEmptyWareHouse(string materiaBatch, TaskTypeEnum taskType, FloorEnum floor)
+        //{
+        //    //直接调用目标库位计算方法，能够计算出目标库位则有库位，否则就是没有
+        //    //一楼采用完全不混放模式
+        //    //二楼视配置
+
+
+        //}
+
+        /// <summary>
+        /// 获取可用的提升机库位
+        /// </summary>
+        /// <param name="floor"></param>
+        /// <returns></returns>
+        public async Task<List<StorageRackDto>> GetUsableElevatorWareHouse(FloorEnum floor)
+        {
+            List<long?> reservoirAreaIds = floor == FloorEnum.FirstFloor ? [1091, 1092] : [2091, 2092];
+
+            List<StorageRackDto> elevatorWarehouse = await
+                                                               GetListByExpression(p =>
+                                                               reservoirAreaIds.Contains(p.ReservoirAreaId)
+                                                                    &&
+                                                                   !p.IsLock && !p.IsDisabled
+                                                                );
+            return elevatorWarehouse;
+        }
+
+        /// <summary>
+        /// 根据提升机编号和通道号获取提所属库位信息
+        /// </summary>
+        /// <param name="elevatorNo"></param>
+        /// <param name="channel"></param>
+        /// <returns></returns>
+        public async Task<StorageRackDto> GetElevatorWareHouse(int elevatorNo, int channel)
+        {
+            string nameMatch = elevatorNo == 1 ? "1号" : "2号";
+            StorageRackDto storageRack = await GetSingalByExpression(p => p.ElevatorChannel == channel && p.StorageRackName.Contains(nameMatch));
+
+            return storageRack;
+        }
+
+        public async Task<bool> Lock(StorageRackDto storageRack)
+        {
+            storageRack.IsLock = true;
+
+            LogHelper.Info($"锁定库位{storageRack.StorageRackNo}");
+
+            return await base.EditSingalWithSpecificCols(storageRack, ["IsLock"]);
+        }
+
+        public async Task<bool> Unlock(StorageRackDto storageRack)
+        {
+            storageRack.IsLock = false;
+            LogHelper.Info($"解锁库位{storageRack.StorageRackNo}");
+
+            return await base.EditSingalWithSpecificCols(storageRack, ["IsLock"]);
+        }
+
+        public Task<bool> UpdateLockStatus(Guid id, bool isLock)
+        {
+            return base.ExcuteSql($"update StorageRack set IsLock = {isLock} where Id = '{id}'");
+        }
+
+        public Task<bool> UpdateDisableStatus(Guid id, bool isDisable)
+        {
+            return base.ExcuteSql($"update StorageRack set IsDisabled = {isDisable} where Id = '{id}'");
+        }
+
+        private static readonly SemaphoreSlim SemaphoreSlim = new(1,1);
+        public async Task<StorageRackDto> GetUsableTransferStorageRack()
+        {
+            await SemaphoreSlim.WaitAsync();
+
+            StorageRackDto storageRackDto = await
+                            base.GetSingalByExpression(p =>
+                            p.Transport == TransportEnum.TransitArea &&
+                            !p.IsLock &&
+                            !p.IsDisabled &&
+                            string.IsNullOrEmpty(p.BarCode));
+
+            if (storageRackDto != null)
+                await Lock(storageRackDto);
+
+            SemaphoreSlim.Release();
+            return storageRackDto;
+        }
+
+        //public async Task<int> PreCalUsableStorageRackCount(FloorEnum floor)
+        //{
+        //    //1. 一楼不混放，需要查找同批次，或者空白列
+        //    //2.二楼可以混放，仅需要查找到一个空库位即可
+        //}
+    }
+}

wmsjst/JSMachine.WMS.Application/ServiceImpl/UserInfoService.cs

@@ -0,0 +1,19 @@
+using JSMachine.WMS.App.Dto;
+using JSMachine.WMS.App.IService;
+using JSMachine.WMS.Domain.Entity;
+using JSMachine.WMS.Domain.IRepository;
+
+namespace JSMachine.WMS.App.ServiceImpl
+{
+    public class UserInfoService : BaseService<UserInfoDto, UserInfo>, IUserInfoService
+    {
+        private IUserInfoRepository _userInfoRepository;
+        
+        public UserInfoService(IUserInfoRepository repository) : base(repository)
+        {
+            _userInfoRepository = repository;
+        }
+
+        // 可以在这里添加UserInfo特有的方法实现
+    }
+}