wxw
2025-06-07 ee8d6bd6c4077c3aeb84170bec819264b5ca29d8
任务列表增加单据查询
8个文件已修改
47 ■■■■ 已修改文件
Admin.NET/WCS.Application/Entity/WcsTask.cs 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Admin.NET/WCS.Application/Model/TaskRequest.cs 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskInput.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskOutput.cs 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Admin.NET/WCS.Application/Util/HttpService.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Web/src/views/wcs/wcsTask/index.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Admin.NET/WCS.Application/Entity/WcsTask.cs
@@ -162,5 +162,11 @@
    /// </summary>
    [SugarColumn(ColumnName = "IsBale", ColumnDescription = "是否裹包")]
    public string IsBale { get; set; }
    /// <summary>
    /// 单据号
    /// </summary>
    [SugarColumn(ColumnName = "OrderNo", ColumnDescription = "单据号", Length = 20)]
    public string? OrderNo { get; set; }
}
Admin.NET/WCS.Application/Model/TaskRequest.cs
@@ -95,7 +95,10 @@
    public string Qty { get; set; }
    public string CompleteQty { get; set; }
    /// <summary>
    /// 单据号
    /// </summary>
    public string OrderNo { get; set; }
}
Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
@@ -136,10 +136,10 @@
                //IsSuccess =TaskSuccessEnum.Success,
                Levels = 999,
                Origin = "WMS",
                StartRoadway= models.StartRoadway,
                StartRoadway = models.StartRoadway,
                StartLocate = models.StartLocate,
                EndLocate = models.EndLocate,
                EndRoadway= models.EndRoadway,
                EndRoadway = models.EndRoadway,
                PalletNo = models.PalletNo,
                IsBale = bale,
@@ -147,7 +147,9 @@
                LotNo = models.LotNo,
                SkuName = models.SkuName,
                Qty = int.Parse(nqty),
                CompleteQty = int.Parse(ncomqty)
                CompleteQty = int.Parse(ncomqty),
                OrderNo = models.OrderNo
            };
            _db.Insertable(taskAdd).ExecuteCommand();           
Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskInput.cs
@@ -206,6 +206,11 @@
        /// </summary>
        public string? Origin { get; set; }
        /// <summary>
        /// 单据号
        /// </summary>
        public string? OrderNo { get; set; }
}
    /// <summary>
Admin.NET/WCS.Application/Service/WcsTask/Dto/WcsTaskOutput.cs
@@ -129,7 +129,12 @@
    /// 完成时间
    /// </summary>
    public DateTime? FinishDate { get; set; }
    /// <summary>
    /// 单据号
    /// </summary>
    public string? OrderNo { get; set; }
    /// <summary>
    /// 最后写入流程控制字值
    /// </summary>
Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
@@ -51,6 +51,7 @@
                u.TaskNo.Contains(input.SearchKey)
            )
            .WhereIF(!string.IsNullOrWhiteSpace(input.TaskNo), u => u.TaskNo.Contains(input.TaskNo.Trim()))
            .WhereIF(!string.IsNullOrWhiteSpace(input.OrderNo), u => u.OrderNo.Contains(input.OrderNo.Trim()))
            .WhereIF(input.TaskType.HasValue, u => u.TaskType == input.TaskType)
            .WhereIF(input.Status.HasValue, u => u.Status == input.Status)
            .WhereIF(!string.IsNullOrWhiteSpace(input.PalletNo), u => u.PalletNo.Contains(input.PalletNo.Trim()))
Admin.NET/WCS.Application/Util/HttpService.cs
@@ -64,7 +64,8 @@
                    TaskNo = result.TaskList.TaskNo,
                    Levels = 999,
                    EndLocate = result.TaskList.EndLocate,
                    EndRoadway = result.TaskList.EndRoadway
                    EndRoadway = result.TaskList.EndRoadway,
                    OrderNo=result.TaskList.OrderNo
                };
                _db.Insertable(taskAdd).ExecuteCommand();
Web/src/views/wcs/wcsTask/index.vue
@@ -16,7 +16,7 @@
              </el-col>
              <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
                <el-form-item label="任务号">
                  <el-input v-model="queryParams.taskNo" clearable="" placeholder=" " />
                  <el-input v-model="queryParams.taskNo" clearable="" placeholder="请输入任务号" />
                </el-form-item>
              </el-col>
              <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
@@ -38,6 +38,11 @@
              <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
                <el-form-item label="托盘号">
                  <el-input v-model="queryParams.palletNo" clearable="" placeholder="请输入托盘号" />
                </el-form-item>
              </el-col>
              <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
                <el-form-item label="单据号">
                  <el-input v-model="queryParams.orderNo" clearable="" placeholder="请输入单据号" />
                </el-form-item>
              </el-col>
              <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
@@ -85,11 +90,12 @@
            <el-table-column prop="startLocate" label="起始位置" show-overflow-tooltip="" />
            <el-table-column prop="endLocate" label="结束位置" show-overflow-tooltip="" />
            <el-table-column prop="palletNo" label="托盘号" show-overflow-tooltip="" />
            <el-table-column prop="orderNo" label="单据号" show-overflow-tooltip="" />
            <el-table-column prop="qty" label="拆垛箱数" show-overflow-tooltip="" />
            <el-table-column prop="palletQty" label="整跺箱数" show-overflow-tooltip="" />
            <el-table-column prop="lotNo" label="批次号" show-overflow-tooltip="" />
            <el-table-column prop="skuNo" label="物料编码" show-overflow-tooltip="" />
            <el-table-column prop="skuName" label="物料名称" show-overflow-tooltip="" />
            <el-table-column prop="skuName" label="物料名称" show-overflow-tooltip="" />
            <el-table-column prop="unstackingMode" width="100" label="拆垛方式" show-overflow-tooltip="">
              <template #default="scope">
                <span v-if="scope.row.unstackingMode">