1

Huangxiaoqiang-03

2024-11-06 f51582d5b4b498f28513f215f91828ef181df4a1

1

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue

@@ -85,14 +85,14 @@
        field: "taskNum",
        title: "任务号",
        type: "int",
        width: 90,
        width: 80,
        align: "left",
      },
      {
        field: "palletCode",
        title: "托盘编号",
        type: "string",
        width: 200,
        width: 150,
        align: "left",
      },
      {

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_hty.vue

@@ -85,14 +85,14 @@
        field: "taskNum",
        title: "任务号",
        type: "int",
        width: 90,
        width: 80,
        align: "left",
      },
      {
        field: "palletCode",
        title: "托盘编号",
        type: "string",
        width: 200,
        width: 150,
        align: "left",
      },
      {

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/82242488-18b2-4b8c-8e8a-7a4fdd15fb8d.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/af58cea9-a26d-4385-bef3-6624f0803a43.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/d616aa61-dca5-4e9c-a56b-6e4beb5c2afb.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/e5043e1a-f8b6-46b3-a047-7f231afbd3a8.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/System/APIÇëÇó/2024-11-04/ÈÎÎñÈ¡Ïû241104.txt

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/System/APIÇëÇó/2024-11-04/ÈÎÎñÍê³É241104.txt

ÎļþÒÑɾ³ý

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -400,7 +400,7 @@
            try
            {
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】!");
                return UpdateTaskStatusToNext(task);
            }
            catch (Exception ex)
@@ -602,7 +602,7 @@
            }
            finally
            {
                WriteLog.GetLog("完成任务").Write(JsonConvert.SerializeObject(content), "完成任务");
                WriteLog.GetLog("完成任务").Write($"操作人：{(App.User.UserId > 0 ? App.User.UserName : "")}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "完成任务");
            }
            return content;
        }
@@ -705,7 +705,7 @@
            }
            finally
            {
                WriteLog.GetLog("取消任务").Write(JsonConvert.SerializeObject(content), "取消任务");
                WriteLog.GetLog("取消任务").Write($"操作人：{(App.User.UserId > 0 ? App.User.UserName : "")}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "取消任务");
            }
        }
        /// <summary>

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs

@@ -1,5 +1,6 @@
using HslCommunication;
using Microsoft.AspNetCore.Components.Routing;
using Newtonsoft.Json;
using Quartz;
using SqlSugar.Extensions;
using System;
@@ -7,8 +8,10 @@
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Net;
using System.Reflection.Metadata;
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Common.Log;
using WIDESEA_Core.Enums;
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_ITaskInfoRepository;
@@ -97,6 +100,7 @@
            catch (Exception ex)
            {
                //Console.WriteLine(nameof(CommonStackerCraneJob) + ":" + ex.ToString());
                WriteLog.GetLog("堆垛机异常").Write($"{nameof(CommonStackerCraneJob)}:{ex.Message}", "堆垛机异常");
            }
            return Task.CompletedTask;
        }

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/GetStackerObject.cs

@@ -114,7 +114,6 @@
            for (int i = 0; i < devicePros.Count; i++)
            {
                object readStatus = speStackerCrane.Communicator.ReadAsObj(devicePros[i].DeviceProAddress, devicePros[i].DeviceDataType);
                //todo åè®®æ˜Žç»†ä¿¡æ¯æœªèŽ·å–到时抛出异常
                DeviceProtocolDetailDTO? deviceProtocolDetail = speStackerCrane.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == devicePros[i].DeviceProParamName) ?? throw new Exception();
                deviceProtocolDetail = speStackerCrane.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == devicePros[i].DeviceProParamType && x.ProtocalDetailValue.Equals(readStatus.ToString()));
                if (deviceProtocolDetail != null)

 ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/StackerCraneTaskCommand.cs

@@ -76,7 +76,7 @@
        /// <summary>
        /// æ‰˜ç›˜å·
        /// </summary>
        [DataLength(25)]
        [DataLength(30)]
        public string Barcode { get; set; }
        #endregion <Public Menber>
    }

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient.zip

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/extension/basic/extend/GetLocationStatus.vue

@@ -120,6 +120,7 @@
                    type: "datetime",
                    width: 160,
                    align: "left",
                    sort: true,
                },
                {
                    field: "modifier",
@@ -136,6 +137,7 @@
                    width: 160,
                    align: "left",
                    hidden: true,
                    sort: true,
                },
                {
                    field: "remark",
@@ -146,6 +148,18 @@
                    hidden: true,
                },
            ],
            paginations: {
                sort: "CreateDate",
                order: "desc",
                Foots: "",
                total: 0,
                // 2020.08.29增加自定义分页条大小
                sizes: [30, 60, 100, 120],
                size: 30, // é»˜è®¤åˆ†é¡µå¤§å°
                Wheres: [],
                page: 1,
                rows: 30,
            },
            dictionaryList: null,
        };
    },
@@ -187,22 +201,22 @@
                });
        },
        getDictionary(row, column) {
      if (this.dictionaryList) {
        var item = this.dictionaryList.find((x) => x.dicNo == column.bindKey);
        if (item) {
          var dicItem = item.data.find((x) => x.key == row[column.field]);
          console.log(dicItem);
          if (dicItem) {
            return dicItem.value;
          } 
          else {
            return row[column.field];
          }
        } else {
          return row[column.field];
        }
      }
    },
            if (this.dictionaryList) {
                var item = this.dictionaryList.find((x) => x.dicNo == column.bindKey);
                if (item) {
                    var dicItem = item.data.find((x) => x.key == row[column.field]);
                    console.log(dicItem);
                    if (dicItem) {
                        return dicItem.value;
                    }
                    else {
                        return row[column.field];
                    }
                } else {
                    return row[column.field];
                }
            }
        },
    },



 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/extension/basic/locationInfo.js

@@ -20,31 +20,30 @@
      let EnableBtn = this.buttons.find(x => x.value == 'Enable');
      if (EnableBtn) {
        EnableBtn.onClick = function () {
          if (this.selection.length === 0) {
            return this.$message.error("请选择至少一条数据");
          }
          var keys = this.selection.map((item) => item.id); // èŽ·å–选中行的id
    
          let rows = this.$refs.table.getSelected();
          if (rows.length == 0) return this.$error("请选择数据!");
          var keys = rows.map(x => { return x.id });
          this.http
            .post("api/LocationInfo/LocationEnableStatus", keys, "数据处理中")
            .then((x) => {
              if (!x.status) return this.$message.error(x.message);
              this.$message.success("操作成功");
              this.refresh();
            });
        }
      }
      let DisableBtn = this.buttons.find(x => x.value == 'Disable');
      if (DisableBtn) {
        DisableBtn.onClick = function () {
          if (this.selection.length === 0) {
            return this.$message.error("请选择至少一条数据");
          }
          var keys = this.selection.map((item) => item.id); // èŽ·å–选中行的id
          let rows = this.$refs.table.getSelected();
          if (rows.length == 0) return this.$error("请选择数据!");
          var keys = rows.map(x => { return x.id });
          this.http
            .post("api/LocationInfo/LocationDisableStatus", keys, "数据处理中")
            .then((x) => {
              if (!x.status) return this.$message.error(x.message);
              this.$message.success("操作成功");
              this.refresh();
            });
        }
      }

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/areaInfo.vue

@@ -111,19 +111,19 @@
        align: "left",
      },
      {
        field: "areaCode",
        title: "区域编号",
        type: "string",
        width: 80,
        align: "left",
      },
      {
        field: "warehouseId",
        title: "仓库主键",
        type: "string",
        width: 90,
        align: "left",
        bind:{ key: "warehouse", data: [] },
      },
      {
        field: "areaCode",
        title: "区域编号",
        type: "string",
        width: 150,
        align: "left",
      },
      {
        field: "areaName",
@@ -167,6 +167,7 @@
        type: "datetime",
        width: 160,
        align: "left",
        sort: true,
      },
      {
        field: "modifier",
@@ -181,6 +182,7 @@
        type: "datetime",
        width: 160,
        align: "left",
        sort: true,
      },
      {
        field: "remark",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/areaRouter.vue

@@ -36,11 +36,11 @@
    const editFormOptions = ref([
      [
        {title: "起点",required: true,field: "startArea",type: "string",},
        {title: "终点区域ID",required: true,field: "nextArea",type: "string",},
        {title: "终点区域ID",required: true,field: "nextArea",type: "select",dataKey: "areainfo",data: [],},
        
      ],
      [
        {title: "路由类型",field: "routerType",type: "select",dataKey: "locationStatusEnum",data: [],},
        {title: "路由类型",field: "routerType",type: "like"},
        {title: "是否为终点",field: "isEnd",type: "select",dataKey: "enable",data: [],}
      ],
    ]);
@@ -54,10 +54,11 @@
    const searchFormOptions = ref([
      [
        {title: "起点",required: true,field: "startArea",type: "string",},
        {title: "终点区域ID",required: true,field: "nextArea",type: "string",},
        {title: "终点区域ID",field: "nextArea",type: "select",dataKey: "areainfo",data: [],},
        // {title: "终点区域ID",required: true,field: "nextArea",type: "string",},
      ],
      [
        {title: "路由类型",field: "routerType",type: "select",dataKey: "locationStatusEnum",data: [],},
        {title: "路由类型",field: "routerType",type: "like"},
        {title: "是否为终点",field: "isEnd",type: "select",dataKey: "enable",data: [],}
      ],
    ]);
@@ -85,6 +86,7 @@
        type: "string",
        width: 150,
        align: "left",
        bind:{ key: "areainfo", data: [] },
      },
      {
        field: "routerType",
@@ -122,6 +124,7 @@
        type: "datetime",
        width: 160,
        align: "left",
        sort: true,
      },
      {
        field: "modifier",
@@ -136,6 +139,7 @@
        type: "datetime",
        width: 160,
        align: "left",
        sort: true,
      },
      {
        field: "remark",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/cachePoint.vue

@@ -38,10 +38,10 @@
    });
    const editFormOptions = ref([
      [
        {title: "区域主键",required: true,field: "areaId",type: "string",},
        {title: "缓存点编号",required: true,field: "pointCode",type: "string",},
        {title: "区域主键",required: true,field: "areaId",type: "string",},
        {title: "缓存点状态",field: "pointStatus",type: "select",dataKey: "locationStatusEnum",data: [],},
        {title: "是否禁用",field: "enableStatus",type: "select",dataKey: "enableEnum",data: [],},
        {title: "是否禁用",field: "enableStatus",type: "select",dataKey: "enableStatusEnum",data: [],},
      ],[
        { title: "行", field: "row", type: "string" },
        { title: "列", field: "column", type: "string" },
@@ -61,10 +61,10 @@
    });
    const searchFormOptions = ref([
      [
        {title: "区域主键",field: "areaId",type: "string",},
        {title: "缓存点编号",field: "pointCode",type: "string",},
        {title: "区域主键",field: "areaId",type: "select",dataKey: "areainfo",data: [],},
        {title: "缓存点状态",field: "pointStatus",type: "select",dataKey: "locationStatusEnum",data: [],},
        {title: "是否禁用",field: "enableStatus",type: "select",dataKey: "enableEnum",data: [],},
        {title: "是否禁用",field: "enableStatus",type: "select",dataKey: "enableStatusEnum",data: [],},
      ],[
        { title: "行", field: "row", type: "string" },
        { title: "列", field: "column", type: "string" },
@@ -89,6 +89,7 @@
        type: "int",
        width: 90,
        align: "left",
        bind:{ key: "areainfo", data: [] },
      },
      {
        field: "pointCode",
@@ -111,7 +112,7 @@
        type: "decimal",
        width: 90,
        align: "left",
        bind: { key: "enableEnum", data: [] },
        bind: { key: "enableStatusEnum", data: [] },
      },
      {
        field: "row",
@@ -161,6 +162,7 @@
        type: "datetime",
        width: 160,
        align: "left",
        sort: true,
      },
      {
        field: "modifier",
@@ -175,6 +177,7 @@
        type: "datetime",
        width: 160,
        align: "left",
        sort: true,
      },
      {
        field: "remark",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue

@@ -66,10 +66,7 @@
        type: "string",
        width: 90,
        align: "left",
        bind: {
          key: "areainfo",
          data: []
        }
        bind: {key: "areainfo",data: []}
      },
      {
        field: "locationCode",
@@ -161,6 +158,7 @@
        type: "datetime",
        width: 160,
        align: "left",
        sort: true,
      },
      {
        field: "modifier",
@@ -175,6 +173,7 @@
        type: "datetime",
        width: 160,
        align: "left",
        sort: true,
      },
      {
        field: "remark",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/roadwayInfo.vue

@@ -62,7 +62,9 @@
          field: "enalbeStatus",
          type: "string",
          readonly: true,
        },
          dataKey: "enableStatusEnum",
          data: [],
       },
      ],
      [
        {
@@ -100,20 +102,19 @@
    const searchFormOptions = ref([
      [
        { title: "巷道编号", field: "roadwayNo", type: "like" },
        { title: "仓库主键", field: "warehouseId", type: "like" },
        { title: "禁用状态", field: "enalbeStatus", type: "like" },
        // { title: "仓库主键", field: "warehouseId", type: "like" },
        { title: "禁用状态", field: "enableStatus",type: "select",dataKey: "enableStatusEnum",data: [],},
        { title: "设备编号", field: "deviceNo", type: "like" },
      ],
      [
        { title: "入库站台编号", field: "inStationCode", type: "like" },
        { title: "堆垛机入库站台编号", field: "inSCStationCode", type: "like" },
        { title: "出库站台编号", field: "outStationCode", type: "like" },
        {
          title: "堆垛机出库站台编号",
          field: "outSCStationCode",
          type: "like",
        },
        
      ],
      [
        { title: "出库站台编号", field: "outStationCode", type: "like" },
        { title: "堆垛机出库站台编号",field: "outSCStationCode",type: "like",},
      ]
    ]);
    const columns = ref([
      {
@@ -133,17 +134,17 @@
        width: 90,
        align: "left",
      },
      {
        field: "warehouseId",
        title: "仓库主键",
        type: "string",
        width: 150,
        align: "left",
      },
      // {
      //   field: "warehouseId",
      //   title: "仓库主键",
      //   type: "string",
      //   width: 150,
      //   align: "left",
      // },
      {
        field: "enableStatus",
        title: "禁用状态",
        type: "string",
        type: "select",
        width: 150,
        align: "left",
        bind: { key: "enableStatusEnum", data: [] },

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue

@@ -24,7 +24,7 @@
      cnName: "入库单",
      name: "inboundOrder",
      url: "/InboundOrder/",
      sortName: "id",
      sortName: "CreateDate",
    });
    const editFormFields = ref({
      orderType: "",
@@ -96,7 +96,7 @@
          data: [],
        },
        { title: "创建者", field: "creater", type: "like" },
        { title: "创建时间", field: "createDate", type: "datatime" },
        { title: "创建时间", field: "createDate", type: "datetime" },
      ],
    ]);
    const columns = ref([

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue

@@ -24,7 +24,7 @@
      cnName: "出库单",
      name: "outboundOrder",
      url: "/OutboundOrder/",
      sortName: "id",
      sortName: "CreateDate",
    });
    const editFormFields = ref({
      orderType: "",
@@ -105,7 +105,7 @@
          data: [],
        },
        { title: "创建者", field: "creater", type: "like" },
        { title: "创建时间", field: "createDate", type: "datatime" },
        { title: "创建时间", field: "createDate", type: "datetime" },
      ],
    ]);
    const columns = ref([

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/record/locationStatusChangeRecord.vue

@@ -24,7 +24,7 @@
        cnName: "货位状态变动记录",
        name: "locationStatusChangeRecord",
        url: "/LocationStatusChangeRecord/",
        sortName: "id",
        sortName: "CreateDate",
      });
      const editFormFields = ref({
        deviceCode: "",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/record/stockQuantityChangeRecord.vue

@@ -24,7 +24,7 @@
        cnName: "库存变动信息记录",
        name: "stockQuantityChangeRecord",
        url: "/StockQuantityChangeRecord/",
        sortName: "id",
        sortName: "CreateDate",
      });
      const editFormFields = ref({
        

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue

@@ -24,7 +24,7 @@
        cnName: "库存信息",
        name: "stockInfo",
        url: "/StockInfo/",
        sortName: "id",
        sortName: "CreateDate",
      });
      const editFormFields = ref({
        deviceCode: "",
@@ -37,63 +37,16 @@
        deviceRemark: "",
      });
      const editFormOptions = ref([
        [
          {
            title: "设备编号",
            required: true,
            field: "deviceCode",
            type: "string",
          },
          {
            title: "设备名称",
            required: true,
            field: "deviceName",
            type: "string",
          },
          {
            title: "设备类型",
            required: true,
            field: "deviceType",
            type: "string",
          },
          {
            title: "设备状态",
            required: true,
            field: "deviceStatus",
            type: "string",
          },
        ],
        [
          { title: "设备IP", required: true, field: "deviceIp", type: "string" },
          {
            title: "设备端口",
            required: true,
            field: "devicePort",
            type: "string",
          },
          {
            title: "PLC类型",
            required: true,
            field: "devicePlcType",
            type: "string",
          },
          {
            title: "备注",
            field: "deviceRemark",
            type: "string",
          },
        ],
        
      ]);
      const searchFormFields = ref({
        deviceCode: "",
        deviceType: "",
        deviceStatus: "",
        palletCode: "",
        locationCode: "",
      });
      const searchFormOptions = ref([
        [
          { title: "设备编号", field: "deviceCode" },
          { title: "设备类型", field: "deviceType" },
          { title: "设备状态", field: "deviceStatus" },
          { title: "托盘编号", field: "palletCode" },
          { title: "货位编号", field: "locationCode" },
        ],
      ]);
      const columns = ref([

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/stock/stockView.vue

@@ -24,7 +24,7 @@
      cnName: "库存视图",
      name: "stockView",
      url: "/stockView/",
      sortName: "stockId",
      sortName: "CreateDate",
    });
    const editFormFields = ref({
      palletCode: "",
@@ -32,26 +32,7 @@
      locationName: "",
    });
    const editFormOptions = ref([
      [
        {
          title: "托盘编号",
          required: true,
          field: "palletCode",
          type: "string",
        },
        {
          title: "货位编号",
          required: true,
          field: "locationCode",
          type: "string",
        },
        {
          title: "货位名称",
          required: true,
          field: "locationName",
          type: "string",
        },
      ],
      
    ]);
    const searchFormFields = ref({
      palletCode: "",
@@ -61,6 +42,8 @@
      [
        { title: "托盘编号", field: "palletCode" },
        { title: "货位编号", field: "locationCode" },
        { title: "货位状态", field: "locationStatus" ,type: "selectList",dataKey: "locationStatusEnum",data: [],},
        { title: "库存状态", field: "stockStatus" ,type: "selectList",dataKey: "stockStatusEmun",data: [],},
      ],
    ]);
    const columns = ref([

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue

@@ -45,30 +45,16 @@
      [
        { title: "任务号", field: "taskNum", type: "int" },
        { title: "托盘编号", field: "palletCode", type: "like" },
        {
          title: "任务类型",
          field: "taskType",
          type: "selectList",
          dataKey: "taskTypeEnum",
          data: [],
        },
        {
          title: "任务状态",
          field: "taskStatus",
          type: "selectList",
          dataKey: "taskStatusEnum",
          data: [],
        },
        { title: "创建人", field: "creater", type: "like" },
      ],
      [
        { title: "任务类型",field: "taskType",type: "selectList",dataKey: "taskTypeEnum",data: [],},
        { title: "任务状态",field: "taskStatus",type: "selectList",dataKey: "taskStatusEnum",data: [],},
        { title: "巷道号", field: "roadway", type: "like" },
      ],
      [
        { title: "起始地址", field: "sourceAddress", type: "like" },
        { title: "目标地址", field: "targetAddress", type: "like" },
        { title: "当前位置", field: "currentAddress", type: "like" },
        { title: "下一位置", field: "nextAddress", type: "like" },
      ],
      [
        { title: "巷道号", field: "roadway", type: "like" },
        { title: "创建人", field: "creater", type: "like" },
        { title: "创建时间", field: "createDate", type: "datetime" },
      ],
    ]);
@@ -87,14 +73,14 @@
        field: "taskNum",
        title: "任务号",
        type: "int",
        width: 90,
        width: 80,
        align: "left",
      },
      {
        field: "palletCode",
        title: "托盘编号",
        type: "string",
        width: 200,
        width: 150,
        align: "left",
      },
      {

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue

@@ -42,33 +42,19 @@
      createDate: "",
    });
    const searchFormOptions = ref([
      [
    [
        { title: "任务号", field: "taskNum", type: "int" },
        { title: "托盘编号", field: "palletCode", type: "like" },
        {
          title: "任务类型",
          field: "taskType",
          type: "selectList",
          dataKey: "taskTypeEnum",
          data: [],
        },
        {
          title: "任务状态",
          field: "taskStatus",
          type: "selectList",
          dataKey: "taskStatusEnum",
          data: [],
        },
        { title: "创建人", field: "creater", type: "like" },
      ],
      [
        { title: "任务类型",field: "taskType",type: "selectList",dataKey: "taskTypeEnum",data: [],},
        { title: "任务状态",field: "taskStatus",type: "selectList",dataKey: "taskStatusEnum",data: [],},
        { title: "巷道号", field: "roadway", type: "like" },
      ],
      [
        { title: "起始地址", field: "sourceAddress", type: "like" },
        { title: "目标地址", field: "targetAddress", type: "like" },
        { title: "当前位置", field: "currentAddress", type: "like" },
        { title: "下一位置", field: "nextAddress", type: "like" },
      ],
      [
        { title: "巷道号", field: "roadway", type: "like" },
        { title: "创建人", field: "creater", type: "like" },
        { title: "创建时间", field: "createDate", type: "datetime" },
      ],
    ]);
@@ -87,14 +73,14 @@
        field: "taskNum",
        title: "任务号",
        type: "int",
        width: 90,
        width: 80,
        align: "left",
      },
      {
        field: "palletCode",
        title: "托盘编号",
        type: "string",
        width: 200,
        width: 150,
        align: "left",
      },
      {
@@ -164,6 +150,13 @@
        align: "left",
      },
      {
        field: "depth",
        title: "深度",
        type: "int",
        width: 80,
        align: "left",
      },
      {
        field: "dispatchertime",
        title: "任务下发时间",
        type: "datetime",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/00ab07ce-7bba-41c6-b253-e738d0e18292.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2fd3f4bb-dd88-4d45-8bb4-44ba1e161435.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/53c83226-20bf-47f8-9fd2-174b5f2870f8.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/71c2dff7-d30c-413a-bdc7-223613afcd73.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/cf988643-dd5c-4993-87df-dfdde268200d.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs

@@ -47,7 +47,7 @@
            List<Dt_LocationInfo> locationInfos = Repository.QueryData(x => keys.Contains(x.Id));
            locationInfos.ForEach(x =>
            {
                x.EnableStatus = EnableEnum.Enable.ObjToInt();
                x.EnableStatus = EnableStatusEnum.Normal.ObjToInt();
            });
            Repository.UpdateData(locationInfos);

@@ -59,7 +59,7 @@
            List<Dt_LocationInfo> locationInfos = Repository.QueryData(x => keys.Contains(x.Id));
            locationInfos.ForEach(x =>
            {
                x.EnableStatus = EnableEnum.Disable.ObjToInt();
                x.EnableStatus = EnableStatusEnum.Disable.ObjToInt();
            });
            Repository.UpdateData(locationInfos);


 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs

@@ -39,17 +39,17 @@
        {
            try
            {
                Dt_RoadwayInfo roadwayInfo = _basicRepository.RoadwayInfoRepository.QueryFirst(x => x.InStationCode == stationCode) ?? throw new Exception("未找到该站台对应的巷道，请检查基础配置信息");
                Dt_RoadwayInfo roadwayInfo = _basicRepository.RoadwayInfoRepository.QueryFirst(x => x.InStationCode == stationCode) ?? throw new Exception("未找到该站台对应的巷道，请检查基础配置信息!");
                if (roadwayInfo.EnableStatus != EnableStatusEnum.Normal.ObjToInt() && roadwayInfo.EnableStatus != EnableStatusEnum.OnlyIn.ObjToInt())
                {
                    throw new Exception("该巷道不可入库，请检查巷道禁用信息");
                    throw new Exception("该巷道不可入库，请检查巷道禁用信息!");
                }
                if (roadwayInfo.AreaId > 0)
                {
                    Dt_AreaInfo areaInfo = _basicRepository.AreaInfoRepository.QueryFirst(x => x.Id == roadwayInfo.AreaId);
                    if (areaInfo != null && areaInfo.AreaStatus == EnableEnum.Disable.ObjToInt())
                    {
                        throw new Exception("区域被禁用，不可入库");
                        throw new Exception("区域被禁用，不可入库!");
                    }
                }
                if (inboundType == TaskTypeEnum.PalletInbound.ObjToInt())//空盘入库分配逻辑
@@ -63,7 +63,7 @@
            }
            catch (Exception ex)
            {

                throw new Exception(ex.Message);
            }

            return null;
@@ -78,19 +78,19 @@
            List<LocationGroupDTO> locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, LocationStatusEnum.Pallet);
            if (locationGroups != null && locationGroups.Count > 0)
            {
                LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusA == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt());
                LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x =>  x.EnableStatusA == EnableStatusEnum.Normal.ObjToInt()|| x.EnableStatusA == EnableStatusEnum.OnlyIn.ObjToInt());
                int id = locationGroup?.IdA ?? 0;
                return BaseDal.QueryFirst(x => x.Id == id);
            }
            locationGroups = BaseDal.GetLocationGroups(roadway, LocationStatusEnum.Free, LocationStatusEnum.Free);
            if (locationGroups != null && locationGroups.Count > 0)
            {
                LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusB == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt());
                LocationGroupDTO? locationGroup = locationGroups.FirstOrDefault(x => x.EnableStatusB == EnableStatusEnum.Normal.ObjToInt()||x.EnableStatusB == EnableStatusEnum.OnlyIn.ObjToInt());
                int id = locationGroup?.IdB ?? 0;
                return BaseDal.QueryFirst(x => x.Id == id);
            }

            return BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt() || x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() && x.RoadwayNo == roadway), _emptyAssignOrderBy);
            return BaseDal.QueryFirst(x => x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && (x.EnableStatus == EnableStatusEnum.Normal.ObjToInt()||x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt()  && x.RoadwayNo == roadway), _emptyAssignOrderBy);
        }

        private Dt_LocationInfo StoredAssignLocation(string roadway)
@@ -115,13 +115,12 @@

        public Dt_LocationInfo AdjacentDepthLocation(string locationCode)
        {
            Dt_LocationInfo locationInfo = BaseDal.QueryFirst(x => x.LocationCode == locationCode);
            return AdjacentDepthLocation(locationInfo);
            return AdjacentDepthLocation(BaseDal.QueryFirst(x => x.LocationCode == locationCode));
        }

        public Dt_LocationInfo AdjacentDepthLocation(Dt_LocationInfo locationInfo)
        {
            return BaseDal.QueryFirst(x => x.RoadwayNo == locationInfo.RoadwayNo && x.Column == locationInfo.Column && x.Layer == locationInfo.Layer && x.Depth != locationInfo.Depth && x.Row != locationInfo.Row && (SqlFunc.Abs(x.Row - locationInfo.Row) == 1));
            return BaseDal.QueryFirst(x =>  x.Column == locationInfo.Column && x.RoadwayNo == locationInfo.RoadwayNo && x.Layer == locationInfo.Layer && x.Depth != locationInfo.Depth && x.Row != locationInfo.Row && (SqlFunc.Abs(x.Row - locationInfo.Row) == 1));
        }
        public void UpdateLocationLock(Dt_LocationInfo locations, int TaskNum,int changType,bool black)
        {
@@ -159,7 +158,7 @@
            }
            catch (Exception ex)
            {
                throw ex;
                throw new Exception(ex.Message);
            }

        }
@@ -181,65 +180,99 @@
                        _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(result, beforeStatusEnd, changType, "", TaskNum);
                    }
                }
                else
                {
                    if (result != null&&(result.LocationStatus== LocationStatusEnum.Lock.ObjToInt()|| result.LocationStatus==LocationStatusEnum.PalletLock.ObjToInt()))
                    {
                        int beforeStatusEnd = result.LocationStatus;

                        result.LocationStatus = LocationStatusEnum.Free.ObjToInt();

                        BaseDal.UpdateData(result);

                        _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(result, beforeStatusEnd, changType, "", TaskNum);
                    }
                }
            }
            catch (Exception ex)
            {
                throw ex;
                throw new Exception(ex.Message);
            }

        }
        public Dt_LocationInfo isDepth(Dt_LocationInfo locationInfo)
        {
            if (locationInfo.Depth == 2)
            try
            {
               return AdjacentDepthLocation(locationInfo.LocationCode);
                if (locationInfo.Depth == 2)
                {
                    return AdjacentDepthLocation(locationInfo.LocationCode);
                }
                else
                {
                    return null;
                }
            }
            else
            catch (Exception ex)
            {
                return null;
                throw new Exception(ex.Message);
            }
        }
        public void RelocationLock(Dt_LocationInfo locationInfo, Dt_LocationInfo locationInfos, int TaskNum)
        {
            int beforeStartStatus = locationInfo.LocationStatus;
            int beforeEndStatus = locationInfos.LocationStatus;

            locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();

            if (beforeStartStatus == LocationStatusEnum.Pallet.ObjToInt())
            try
            {
                locationInfos.LocationStatus = LocationStatusEnum.PalletLock.ObjToInt();
                locationInfo.LocationStatus = LocationStatusEnum.PalletLock.ObjToInt();
            }
            else
            {
                locationInfos.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
                int beforeStartStatus = locationInfo.LocationStatus;
                int beforeEndStatus = locationInfos.LocationStatus;

                locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();

                if (beforeStartStatus == LocationStatusEnum.Pallet.ObjToInt())
                {
                    locationInfos.LocationStatus = LocationStatusEnum.PalletLock.ObjToInt();
                    locationInfo.LocationStatus = LocationStatusEnum.PalletLock.ObjToInt();
                }
                else
                {
                    locationInfos.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
                    locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
                }

                BaseDal.UpdateData(locationInfo);
                BaseDal.UpdateData(locationInfos);

                _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStartStatus, StockChangeType.Relocation.ObjToInt(), "", TaskNum);
                _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfos, beforeEndStatus, StockChangeType.Relocation.ObjToInt(), "", TaskNum);
            }

            BaseDal.UpdateData(locationInfo);
            BaseDal.UpdateData(locationInfos);

            _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStartStatus, StockChangeType.Relocation.ObjToInt(), "", TaskNum);
            _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfos, beforeEndStatus, StockChangeType.Relocation.ObjToInt(), "", TaskNum);
            catch (Exception ex)
            {
                throw new Exception(ex.Message);
            }
        }
        public void RelocationFree(Dt_LocationInfo locations, int TaskNum)
        {
            int beforeEndStatus = locations.LocationStatus;

            if(locations.LocationStatus== LocationStatusEnum.Lock.ObjToInt())
            try
            {
                locations.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
                int beforeEndStatus = locations.LocationStatus;

                if (locations.LocationStatus == LocationStatusEnum.Lock.ObjToInt())
                {
                    locations.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
                }
                else
                {
                    locations.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
                }


                BaseDal.UpdateData(locations);

                _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locations, beforeEndStatus, StockChangeType.Relocation.ObjToInt(), "", TaskNum);
            }
            else
            catch (Exception ex)
            {
                locations.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
                throw new Exception(ex.Message);
            }
            

            BaseDal.UpdateData(locations);

            _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locations, beforeEndStatus, StockChangeType.Relocation.ObjToInt(), "", TaskNum);
        }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs

@@ -891,7 +891,7 @@
                        {
                            if (propertyInfo.Name == nameof(BaseEntity.Modifier))
                            {
                                propertyInfo.SetValue(obj, App.User.UserId > 0 ? App.User.UserName : App.User.UserId.ToString());
                                propertyInfo.SetValue(obj, App.User.UserId > 0 ? App.User.UserName : "System");
                            }
                            else if (propertyInfo.Name == nameof(BaseEntity.ModifyDate))
                            {
@@ -940,7 +940,7 @@
                                {
                                    if (propertyInfo.Name == nameof(BaseEntity.Modifier))
                                    {
                                        propertyInfo.SetValue(obj, App.User.UserId > 0 ? App.User.UserName : App.User.UserId.ToString());
                                        propertyInfo.SetValue(obj, App.User.UserId > 0 ? App.User.UserName : "System");
                                    }
                                    else if (propertyInfo.Name == nameof(BaseEntity.ModifyDate))
                                    {

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderService.cs

@@ -102,10 +102,6 @@
                else if (inboundOrder.OrderStatus == InboundStatusEnum.未开始.ObjToInt())
                {
                    inboundOrder.OrderStatus = InboundStatusEnum.入库中.ObjToInt();
                    for (int i = 0; i < inboundOrderDetails.Count; i++)
                    {
                        _inboundOrderDetailService.Repository.DeleteAndMoveIntoHty(inboundOrderDetails[i], App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
                    }
                }

                content = MaterielGroupUpdateData(inboundOrder, inboundOrderDetails, stockInfo);

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/LocationStatusChangeRecordSetvice.cs

@@ -78,7 +78,7 @@
            WebResponseContent content = new WebResponseContent();
            try
            {
                List<Dt_LocationStatusChangeRecord> location=BaseDal.QueryData(x=>x.LocationId== id).ToList();
                List<Dt_LocationStatusChangeRecord> location=BaseDal.QueryData(x=>x.LocationId== id).OrderByDescending(x=>x.CreateDate).ToList();

                return content = WebResponseContent.Instance.OK(data: location);
            }

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs

@@ -17,32 +17,39 @@
    {
        public void AddStockChangeRecord(Dt_StockInfo stockInfo, List<Dt_StockInfoDetail> stockInfoDetails, decimal beforeQuantity, decimal totalQuantity, StockChangeType changeType,int taskNum)
        {
            List<Dt_StockQuantityChangeRecord> stockQuantityChangeRecords = new List<Dt_StockQuantityChangeRecord>();
            stockQuantityChangeRecords = _mapper.Map<List<Dt_StockQuantityChangeRecord>>(stockInfoDetails);
            int index = 0;
            decimal currentQuantity = 0;
            stockQuantityChangeRecords.ForEach(x =>
            {
                x.PalleCode = stockInfo.PalletCode;
                x.BeforeQuantity = beforeQuantity;
                if (totalQuantity > beforeQuantity)
            try
            {
                List<Dt_StockQuantityChangeRecord> stockQuantityChangeRecords = new List<Dt_StockQuantityChangeRecord>();
                stockQuantityChangeRecords = _mapper.Map<List<Dt_StockQuantityChangeRecord>>(stockInfoDetails);
                int index = 0;
                decimal currentQuantity = 0;
                stockQuantityChangeRecords.ForEach(x =>
                {
                    x.ChangeQuantity = stockInfoDetails[index].StockQuantity;
                    currentQuantity += stockInfoDetails[index].StockQuantity;
                    x.AfterQuantity = stockInfoDetails[index].StockQuantity + beforeQuantity;
                }
                else
                {
                    x.ChangeQuantity = -stockInfoDetails[index].StockQuantity;
                    currentQuantity -= stockInfoDetails[index].StockQuantity;
                    x.AfterQuantity = beforeQuantity - stockInfoDetails[index].StockQuantity;
                }
                    x.PalleCode = stockInfo.PalletCode;
                    x.BeforeQuantity = beforeQuantity;
                    if (totalQuantity > beforeQuantity)
                    {
                        x.ChangeQuantity = stockInfoDetails[index].StockQuantity;
                        currentQuantity += stockInfoDetails[index].StockQuantity;
                        x.AfterQuantity = stockInfoDetails[index].StockQuantity + beforeQuantity;
                    }
                    else
                    {
                        x.ChangeQuantity = -stockInfoDetails[index].StockQuantity;
                        currentQuantity -= stockInfoDetails[index].StockQuantity;
                        x.AfterQuantity = beforeQuantity - stockInfoDetails[index].StockQuantity;
                    }

                x.ChangeType = changeType.ObjToInt();
                beforeQuantity += x.ChangeQuantity;
                x.TaskNum = taskNum;
            });
            BaseDal.AddData(stockQuantityChangeRecords);
                    x.ChangeType = changeType.ObjToInt();
                    beforeQuantity += x.ChangeQuantity;
                    x.TaskNum = taskNum;
                });
                BaseDal.AddData(stockQuantityChangeRecords);
            }
            catch (Exception ex)
            {
                throw new Exception(ex.Message);
            }
        }
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs

@@ -33,7 +33,6 @@
                SourceAddress = outTask.TargetAddress,
                TargetAddress = cachePoint.PointCode,
                SourceKey = outTask.TaskId,
                //TaskNum = outTask.TaskNum,
                TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
                TaskStatus = AGVTaskStatusEnum.AGV_New.ObjToInt(),
                TaskType = TaskTypeEnum.AGVCarry.ObjToInt(),
@@ -129,18 +128,18 @@
            Dt_AreaRouter areaRouter = _basicService.AreaRouterService.Repository.QueryFirst(x => x.StartArea == startPoint);
            if (areaRouter == null)
            {
                throw new Exception("未找到路由信息");
                throw new Exception("未找到路由信息!");
            }
            Dt_AreaInfo areaInfo = _basicService.AreaInfoService.Repository.QueryFirst(x => x.AreaCode == areaRouter.NextArea);
            if (areaInfo == null)
            {
                throw new Exception("未找到下一区域信息");
                throw new Exception("未找到下一区域信息!");
            }

            Dt_CachePoint? cachePoint = _basicService.CachePointService.AssignCachePoint(areaInfo.Id);
            if (cachePoint == null)
            {
                throw new Exception("未找到空闲缓存点");
                throw new Exception("未找到空闲缓存点!");
            }

            return cachePoint;
@@ -151,18 +150,18 @@
            Dt_AreaRouter areaRouter = _basicService.AreaRouterService.Repository.QueryFirst(x => x.NextArea == endPoint);
            if (areaRouter == null)
            {
                throw new Exception("未找到路由信息");
                throw new Exception("未找到路由信息!");
            }
            Dt_AreaInfo areaInfo = _basicService.AreaInfoService.Repository.QueryFirst(x => x.AreaCode == areaRouter.StartArea);
            if (areaInfo == null)
            {
                throw new Exception("未找到起点缓存区域信息");
                throw new Exception("未找到起点缓存区域信息!");
            }

            Dt_CachePoint? cachePoint = _basicService.CachePointService.GetIbStockCachePoint(areaInfo.Id);
            if (cachePoint == null)
            {
                throw new Exception("未找到有货缓存点");
                throw new Exception("未找到有货缓存点!");
            }
            return cachePoint;
        }
@@ -172,7 +171,7 @@
            Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == Convert.ToInt32(model.Task_id));
            if (task == null)
            {
                return new { code = 404, message = "未找到该任务" };
                return new { code = 404, message = "未找到该任务!" };
            }

            Dt_CachePoint startCachePoint = _basicService.CachePointService.Repository.QueryFirst(x => x.PointCode == task.SourceAddress);

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs

@@ -41,7 +41,7 @@
            {
                return WebResponseContent.Instance.Error("未找到该任务类型业务");
            }
            return WebResponseContent.Instance.Error("错误");
            return WebResponseContent.Instance.Error($"错误");
        }

        /// <summary>
@@ -61,7 +61,7 @@
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error(ex.Message);
                content = WebResponseContent.Instance.Error($"{ex.Message}");
            }
            return content;
        }
@@ -84,7 +84,7 @@
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error(ex.Message);
                content = WebResponseContent.Instance.Error($"{ex.Message}");
            }
            return content;
        }
@@ -106,9 +106,9 @@
            {
                _unitOfWorkManage.BeginTran();
                Dt_LocationInfo? locationInfo = _basicService.LocationInfoService.AssignLocation(stationCode, taskType);
                //Dt_LocationInfo dt_LocationInfo = null;
                if (locationInfo != null)
                {
                    List<Dt_Task> tasks = new List<Dt_Task>();
                    Dt_Task task = new()
                    {
                        CurrentAddress = stationCode,
@@ -125,8 +125,6 @@
                    BaseDal.AddData(task);
                    int beforeStatus = locationInfo.LocationStatus;


                    
                    if (isUpdateStock)
                    {
                        locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
@@ -156,9 +154,10 @@
                        }
                    }
                    _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
                    List<Dt_Task> tasks = new List<Dt_Task>(); 
                     
                    tasks.Add(task);
                    _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Inbound.ObjToInt(), orderNo, task.TaskNum);

                    var response = HttpHelper.Post<WebResponseContent>(url + "ReceiveTask/", tasks, "入库任务下发");
                    if (!response.Status)
                    {
@@ -190,40 +189,40 @@
        {
            if (BaseDal.QueryFirst(x => x.PalletCode == palletCode) != null)
            {
                return (false, "该托盘号已有任务");
                return (false, "该托盘号已有任务!");
            }
            if (BaseDal.QueryFirst(x => (x.SourceAddress == stationCode || x.CurrentAddress == stationCode) && x.TaskStatus == InTaskStatusEnum.InNew.ObjToInt()) != null)
            {
                return (false, "当前入库站台已有一条新建任务");
                return (false, "当前入库站台已有一条新建任务!");
            }
            if (isCheckStock)
            {
                if (stockInfo == null)
                {
                    return (false, "未找到组盘信息");
                    return (false, "未找到组盘信息!");
                }
                if (stockInfo.StockStatus != StockStatusEmun.组盘暂存.ObjToInt())
                {
                    return (false, "该组盘状态不可入库");
                    return (false, "该组盘状态不可入库!");
                }
                if (!string.IsNullOrEmpty(stockInfo.LocationCode))
                {
                    return (false, "该托盘已绑定货位");
                    return (false, "该托盘已绑定货位!");
                }
                if (stockInfo.Details == null || stockInfo.Details.Count == 0)
                {
                    return (false, "没有库存明细信息");
                    return (false, "没有库存明细信息!");
                }
            }
            else
            {
                if (_stockService.StockInfoService.Repository.QueryFirst(x => x.PalletCode == palletCode) != null)
                {
                    return (false, "该托盘已存在库内");
                    return (false, "该托盘已存在库内!");
                }
            }

            return (true, "成功");
            return (true, "成功!");
        }



 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs

@@ -74,12 +74,12 @@

            if (outboundOrderDetail == null)
            {
                throw new Exception("未找到出库单明细信息");
                throw new Exception("未找到出库单明细信息!");
            }

            if (stockSelectViews.Sum(x => x.UseableQuantity) > outboundOrderDetail.OrderQuantity - outboundOrderDetail.LockQuantity)
            {
                throw new Exception("选择数量超出单据数量");
                throw new Exception("选择数量超出单据数量!");
            }
            List<Dt_StockInfo>? stockInfos = null;
            Dt_OutboundOrderDetail? orderDetail = null;
@@ -104,7 +104,7 @@
                }
                else
                {
                    throw new Exception("无库存");
                    throw new Exception("无库存!");
                }
            }
            else
@@ -138,7 +138,7 @@
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
                return WebResponseContent.Instance.Error($"{ex.Message}");
            }
        }


 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -113,22 +113,22 @@
                                return WebResponseContent.Instance.Error(response.Message);
                            }
                            _unitOfWorkManage.CommitTran();
                            return content=responseContent;
                            return content = responseContent;
                        }
                        _unitOfWorkManage.CommitTran();
                        return  content=responseContent;
                        return content = responseContent;
                    }
                }
                return content=WebResponseContent.Instance.Error("未找到任务类型对应业务处理逻辑");
                return content = WebResponseContent.Instance.Error("未找到任务类型对应业务处理逻辑");
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return content=WebResponseContent.Instance.Error(ex.Message);
                return content = WebResponseContent.Instance.Error(ex.Message);
            }
            finally
            {
                WriteLog.GetLog("任务完成").Write(JsonConvert.SerializeObject(content), "任务完成");
                WriteLog.GetLog("任务完成").Write($"操作人：{(App.User.UserId>0? App.User.UserName: "System")}{ Environment.NewLine}{ JsonConvert.SerializeObject(content)}", "任务完成");
            }
        }
        public WebResponseContent TaskCancel(int taskNum)
@@ -175,12 +175,13 @@
            }
            finally
            {
                WriteLog.GetLog("任务取消").Write(JsonConvert.SerializeObject(content), "任务取消");
                WriteLog.GetLog("任务取消").Write($"操作人：{(App.User.UserId > 0 ? App.User.UserName : "System")}{Environment.NewLine}{JsonConvert.SerializeObject(content)}", "任务取消");
            }
        }

        public WebResponseContent UpdateTaskStatus(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
@@ -204,10 +205,17 @@
                {
                    throw new Exception($"任务类型错误,未找到该任务类型,任务号:【{task.TaskNum}】,任务类型:【{task.TaskType}】");
                }
                return WebResponseContent.Instance.Error("未找到任务类型对应业务处理逻辑");
                _unitOfWorkManage.BeginTran();
                task.Dispatchertime = DateTime.Now;
                task.ModifyDate = DateTime.Now;
                task.Modifier = "System";
                BaseDal.UpdateData(task);
                _unitOfWorkManage.CommitTran();
                 return content = WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
@@ -268,13 +276,12 @@
                    PalletCode = task.PalletCode,
                    LocationCode = task.TargetAddress,
                    StockStatus = StockStatusEmun.已入库.ObjToInt(),
                    Creater = App.User.UserId > 0 ? "" : "System",
                    Creater = App.User.UserId > 0 ? App.User.UserName : "System",
                    CreateDate = App.User.UserId > 0 ? DateTime.Now : DateTime.Now,
                };
                Dt_LocationInfo locationInfo = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);

                CheckCompleted(stockInfo, locationInfo);


                _stockService.StockInfoService.Repository.AddData(stockInfo);

@@ -340,21 +347,16 @@
                stockInfo.StockStatus = StockStatusEmun.出库完成.ObjToInt();
                _stockService.StockInfoService.Repository.UpdateData(stockInfo);
                int beforeStatus = locationInfo.LocationStatus;
                if (task.Depth != 1)
                if (locationInfo.Depth == 2)
                {
                    if (!DepthTask(task)) 
                    { 
                        locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
                    if (DepthTask(locationInfo) == false)
                    {
                        _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
                        _basicService.LocationInfoService.Repository.UpdateData(locationInfo);

                    }
                }
                else
                {
                    locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
                    //_basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
                    _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
                }
                locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
                _basicService.LocationInfoService.Repository.UpdateData(locationInfo);

                task.TaskStatus = OutTaskStatusEnum.OutFinish.ObjToInt();
                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
@@ -364,10 +366,11 @@
                beforeQuantity = stockInfo.Details.Where(x => x.Id != 0).Sum(x => x.StockQuantity);

                _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, StockChangeType.Outbound.ObjToInt(), stockInfo.Details.FirstOrDefault()?.OrderNo ?? "", task.TaskNum);
                _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) - beforeQuantity, StockChangeType.Outbound,task.TaskNum);
                _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) - beforeQuantity, StockChangeType.Outbound, task.TaskNum);

                _unitOfWorkManage.CommitTran();
                return OnOutboundTaskCompleted?.Invoke(task) ?? WebResponseContent.Instance.OK();

            }
            catch (Exception ex)
            {
@@ -389,10 +392,15 @@

                int beforeStatus = locationInfo.LocationStatus;

                if (locationInfo.Depth == 2)
                {
                    if (DepthTask(locationInfo) == false)
                    {
                        _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
                    }
                }
                locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
                _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
                _basicService.LocationInfoService.Repository.UpdateData(locationInfo);


                task.TaskStatus = OutTaskStatusEnum.OutFinish.ObjToInt();
                BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.自动完成 : OperateType.人工完成);
@@ -418,12 +426,28 @@
                Dt_StockInfo stockInfo = _stockService.StockInfoService.Repository.GetStockInfo(task.PalletCode);

                Dt_LocationInfo locationEnd = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.TargetAddress);
                Dt_LocationInfo locationStart = _basicService.LocationInfoService.Repository.QueryFirst(x => x.LocationCode == task.SourceAddress);

                CheckCompleted(stockInfo, locationEnd);

                stockInfo.LocationCode = locationEnd.LocationCode;
                stockInfo.StockStatus = StockStatusEmun.已入库.ObjToInt();
                _stockService.StockInfoService.Repository.UpdateData(stockInfo);

                if (locationStart.Depth == 1)
                {
                    if (DepthTask(locationStart) == false)
                    {
                        locationStart.LocationStatus = LocationStatusEnum.Free.ObjToInt();
                        _basicService.LocationInfoService.RelocationFree(locationEnd, task.TaskNum);
                        _basicService.LocationInfoService.Repository.UpdateData(locationStart);
                    }
                    else
                    {
                        locationStart.LocationStatus = LocationStatusEnum.Free.ObjToInt();
                        _basicService.LocationInfoService.Repository.UpdateData(locationStart);
                    }
                }

                _basicService.LocationInfoService.RelocationFree(locationEnd, task.TaskNum);

@@ -460,7 +484,10 @@

                int beforeStatus = locationInfo.LocationStatus;
                locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
                _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Inbound.ObjToInt(), false);
                if (locationInfo.Depth == 2)
                {
                    _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
                }

                _basicService.LocationInfoService.Repository.UpdateData(locationInfo);
                task.TaskStatus = InTaskStatusEnum.InCancel.ObjToInt();
@@ -490,7 +517,10 @@
                int beforeStatus = locationInfo.LocationStatus;

                locationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
                _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
                if (locationInfo.Depth == 2)
                {
                    _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), false);
                }
                _basicService.LocationInfoService.Repository.UpdateData(locationInfo);

                task.TaskStatus = InTaskStatusEnum.InCancel.ObjToInt();
@@ -530,6 +560,13 @@
                _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
                int beforeStatus = locationInfo.LocationStatus;

                if (locationInfo.Depth == 2)
                {
                    if (DepthTask(locationInfo) == false)
                    {
                        _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), true);
                    }
                }
                locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
                _basicService.LocationInfoService.Repository.UpdateData(locationInfo);

@@ -565,8 +602,14 @@

                int beforeStatus = locationInfo.LocationStatus;

                if (locationInfo.Depth == 2)
                {
                    if (DepthTask(locationInfo) == false)
                    {
                        _basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), true);
                    }
                }
                locationInfo.LocationStatus = LocationStatusEnum.Pallet.ObjToInt();
                //_basicService.LocationInfoService.UpdateLocationFree(locationInfo, task.TaskNum, StockChangeType.Outbound.ObjToInt(), true);
                _basicService.LocationInfoService.Repository.UpdateData(locationInfo);

                stockInfo.StockStatus = StockStatusEmun.已入库.ObjToInt();
@@ -616,31 +659,19 @@
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
        public bool DepthTask(Dt_Task task)
        public bool DepthTask(Dt_LocationInfo location)
        {
            Dt_LocationInfo location=_locationInfoService.Repository.QueryFirst(x=>x.LocationCode == task.SourceAddress);
            if(location != null)
            if (location != null )
            {
                if(location.Row%2==0)
                Dt_LocationInfo locations = _locationInfoService.Repository.QueryFirst(x => x.RoadwayNo == location.RoadwayNo && x.Column == location.Column && x.Layer == location.Layer && x.Depth != location.Depth && x.Row != location.Row && (SqlFunc.Abs(x.Row - location.Row) == 1));
                if (locations != null)
                {
                    Dt_LocationInfo locations = _locationInfoService.Repository.QueryFirst(x => x.Row == location.Row - 1 && x.Layer == location.Layer && x.Column == location.Column && x.RoadwayNo == location.RoadwayNo);
                    Dt_Task tasks=BaseDal.QueryFirst(x=>x.SourceAddress == locations.LocationCode);
                    return tasks != null ? true : false;
                }
                else
                {
                    Dt_LocationInfo locations = _locationInfoService.Repository.QueryFirst(x => x.Row == location.Row + 1 && x.Layer == location.Layer && x.Column == location.Column && x.RoadwayNo == location.RoadwayNo);
                    Dt_Task tasks = BaseDal.QueryFirst(x => x.SourceAddress == locations.LocationCode);
                    return tasks != null ? true : false;
                }
            }
            else
            {
                return false;
            }
            
            return false;
        }

        public WebResponseContent GetTaskInfo()
        {
            WebResponseContent content = new WebResponseContent();

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/AreaInfoController.cs

@@ -34,13 +34,13 @@
        }

        [HttpGet(), Route("AreaEnableStatus")]
        public WebResponseContent AreaEnableStatus(int key)
        public WebResponseContent AreaEnableStatus([FromBody] int key)
        {
            return Service.AreaEnableStatus(key);
        }

        [HttpGet, Route("AreaDisableStatus")]
        public WebResponseContent AreaDisableStatus(int key)
        public WebResponseContent AreaDisableStatus([FromBody] int key)
        {
            return Service.AreaDisableStatus(key);
        }

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs

@@ -48,12 +48,12 @@
            return locations;
        }
        [HttpPost, Route("LocationEnableStatus")]
        public WebResponseContent LocationEnableStatus(int[] keys)
        public WebResponseContent LocationEnableStatus([FromBody] int[] keys)
        {
            return Service.LocationEnableStatus(keys); ;
        }
        [HttpPost, Route("LocationDisableStatus")]
        public WebResponseContent LocationDisableStatus(int[] keys)
        public WebResponseContent LocationDisableStatus([FromBody] int[] keys)
        {
            return Service.LocationDisableStatus(keys); ;
        }