深库位与浅库位出库时，进行浅货位移库不可直接出库

Admin

2 天以前 679893ee68e2f7d422431bb22b665e9217f23410

深库位与浅库位出库时，进行浅货位移库不可直接出库

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v9.bin

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v9.bin

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/17.14.1368.60722/CodeChunks.db

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/17.14.1368.60722/CodeChunks.db-shm

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/17.14.1368.60722/CodeChunks.db-wal

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/17.14.1368.60722/SemanticSymbols.db

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/17.14.1368.60722/SemanticSymbols.db-shm

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/17.14.1368.60722/SemanticSymbols.db-wal

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs

@@ -317,6 +317,13 @@
        /// </summary>
        /// <returns></returns>
        WebResponseContent GetFeedbackAxleloading();

        /// <summary>
        /// åˆ é™¤wcs任务
        /// </summary>
        /// <param name="TaskNum"></param>
        /// <returns></returns>
        WebResponseContent DelteWCSTask(int TaskNum);
        /// <summary>
        /// è½¦è½´çº¿ä¸‹æ–™å£ï¼Œè½¦è½´åˆ°ä½åŽè¾“送线申请
        /// </summary>

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs

@@ -68,6 +68,17 @@
        }

        /// <summary>
        /// åˆ é™¤wcs任务
        /// </summary>
        /// <param name="TaskNum"></param>
        /// <returns></returns>
        [HttpPost, Route("DelteWCSTask"), AllowAnonymous]
        public WebResponseContent DelteWCSTask([FromBody] int TaskNum)
        {
            return Service.DelteWCSTask(TaskNum);
        }

        /// <summary>
        /// è¯»å–输送线输送线反馈
        /// </summary>
        /// <param name="TargetAddress"></param>

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs

@@ -62,6 +62,15 @@
                if (task.TaskNum != taskNum)
                {

                    Dt_Task dt_Task=BaseDal.QueryData(x => x.PalletCode == task.PalletCode && x.TaskState== (int)TaskOutStatusEnum.OutNew).FirstOrDefault();
                    if (dt_Task!=null)
                    {
                        dt_Task.SourceAddress = task.TargetAddress;
                        dt_Task.CurrentAddress= task.TargetAddress;

                        BaseDal.UpdateData(dt_Task);
                    }

                    BaseDal.AddData(task);
                    Relocationtask = BaseDal.QueryFirst(x => x.TaskNum == task.TaskNum);
                }

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -846,6 +846,17 @@
            return base.DeleteData(key);
        }


        public WebResponseContent DelteWCSTask(int TaskNum)
        {
            var task = BaseDal.QueryData().Where(x => x.TaskNum == TaskNum).FirstOrDefault();
            if (task == null) return WebResponseContent.Instance.OK();
            var taskHty = task.Adapt<Dt_Task_Hty>();
            taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
            _taskHtyRepository.AddData(taskHty);

            return base.DeleteData(task.TaskId);
        }
        #endregion é‡å†™æ–¹æ³•

        #region

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/dist.zip

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_PreOutbound.vue

@@ -19,12 +19,12 @@
export default defineComponent({
  setup() {
    const table = ref({
      key: "Id",
      key: "id",
      footer: "Foots",
      cnName: "库存暂存出库历史",
      name: "Dt_PreOutbound",
      url: "/Dt_PreOutbound/",
      sortName: "Id",
      sortName: "id",
    });
    const editFormFields = ref({
      palletCode: "",
@@ -78,7 +78,7 @@
    ]);
    const columns = ref([
      {
        field: "Id",
        field: "id",
        title: "主键",
        type: "int",
        width: 90,

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSClient/src/views/widesea_wms/stock/Dt_PreOutbound_hty.vue

@@ -103,7 +103,7 @@
        align: "left",
        sort: true,
      },
      { field: 'stockStatus', title: '状态', type: 'int', width: 110, align: 'left', bind: { key: "", data: [{key:"1",value:"待出库"}] } },
      { field: 'stockStatus', title: '状态', type: 'int', width: 110, align: 'left', bind: { key: "", data: [{key:"1",value:"待出库"},{key:"2",value:"已出库"}] } },
      // {
      //   field: "wheels_Type",
      //   title: "类型",

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v9.bin

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v9.bin

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.strings.v9.bin

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.db

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.db-shm

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.db-wal

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.db

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.db-shm

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.db-wal

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suo

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.bin

Binary files differ

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ConfigConst.cs

@@ -90,6 +90,11 @@
        public const string ReceiveTask = "ReceiveTask";

        /// <summary>
        /// è¯·æ±‚WCS删除任务
        /// </summary>
        public const string DelteWCSTask = "DelteWCSTask";

        /// <summary>
        /// è¯·æ±‚WCS任务
        /// </summary>
        public const string GetStation = "GetStation";

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Location/LocationInfoService.cs

@@ -84,18 +84,21 @@
                // èŽ·å–新的库位的任务
                var internalTransferTask = await _taskRepository.QueryFirstAsync(x => x.SourceAddress == newLocationID && x.Roadway == outboundTask.Roadway && x.TaskState == (int)TaskOutStatusEnum.OutNew);



                LogFactory.GetLog("检查是否需要移库").InfoFormat(true, "需要移库,获取新库位的任务", $"新库位任务：{internalTransferTask}");


                LogFactory.GetLog("检查是否需要移库").InfoFormat(true, "需要移库,未获取到新库位任务", $"");
                return await HandleNoTaskAtLocation(outboundTask.SourceAddress, newLocationID, outboundTask);
                // å¦‚果新的库位没有找到对应的任务
                if (internalTransferTask == null)
                /*if (internalTransferTask == null)
                {
                    LogFactory.GetLog("检查是否需要移库").InfoFormat(true, "需要移库,未获取到新库位任务", $"");
                    return await HandleNoTaskAtLocation(outboundTask.SourceAddress, newLocationID, outboundTask);
                }

                LogFactory.GetLog("检查是否需要移库").InfoFormat(true, "需要移库,获取到新库位任务直接返回", $"新库位任务：{internalTransferTask}");
                // ç›´æŽ¥è¿”回一深位出库任务
                return internalTransferTask;
                return internalTransferTask;*/
            }

            // è¿”回当前库位的出库任务
@@ -382,53 +385,70 @@
    /// <returns>生成的移库任务或原始出库任务</returns>
    private async Task<Dt_Task> HandleNoTaskAtLocation(string originalLocationID, string newLocationID, Dt_Task outboundTask)
    {
        // åˆ¤æ–­è¯¥ä½ç½®æ˜¯å¦æœ‰åº“å­˜
        var stockInfo = await _WheelsStockRepository.QueryFirstAsync(x => x.Wheels_Location == newLocationID);

        // åˆ¤æ–­è¯¥ä½ç½®æ˜¯å¦æœ‰åº“å­˜
        var zdpInfo = await _zdpStockRepository.QueryFirstAsync(x => x.Zdp_Location == newLocationID);


        LogFactory.GetLog("检查是否需要移库").InfoFormat(true, "需要移库,未获取到新库位任务", $"该位置是否有库存：{stockInfo}");
        if (stockInfo == null && zdpInfo==null)
        try
        {
            LogFactory.GetLog("检查是否需要移库").InfoFormat(true, "需要移库,未获取到库存数据", $"直接返回原先出库任务：{outboundTask}");
            // å¦‚果没有库存，直接返回当前出库任务
            return outboundTask;
        }
        else
        {
            // å¦‚果有库存，生成移库任务
            var emptyLocation = RequestLocation("SC1");
            if (emptyLocation == null) throw new Exception("暂无空库");
            // åˆ¤æ–­è¯¥ä½ç½®æ˜¯å¦æœ‰åº“å­˜
            var stockInfo = await _WheelsStockRepository.QueryFirstAsync(x => x.Wheels_Location == newLocationID);

            LogFactory.GetLog("检查是否需要移库").InfoFormat(true, "需要移库,查找能移库货位", $"货位数据：{emptyLocation}");
            var taskNo = await _taskRepository.GetTaskNo();
            Dt_Task newTransferTask = new Dt_Task()
            // åˆ¤æ–­è¯¥ä½ç½®æ˜¯å¦æœ‰åº“å­˜
            var zdpInfo = await _zdpStockRepository.QueryFirstAsync(x => x.Zdp_Location == newLocationID);


            LogFactory.GetLog("检查是否需要移库").InfoFormat(true, "获取的库存信息", $"根据货位编号：{newLocationID}，该位置是否有库存：{stockInfo.ToJson()}");
            if (stockInfo == null && zdpInfo == null)
            {
                CreateDate = DateTime.Now,
                Creater = App.User.UserName == null ? "admin" : App.User.UserName,
                CurrentAddress = stockInfo != null ?stockInfo.Wheels_Location: zdpInfo.Zdp_Location,
                Grade = 99,
                MaterialNo = stockInfo != null ? stockInfo.Wheels_Type: "2",
                NextAddress = emptyLocation.LocationCode,
                PalletCode = stockInfo != null ? stockInfo.Wheels_Num : zdpInfo.Zdp_code,
                Remark = "移库",
                Roadway = "SC1",
                SourceAddress = stockInfo != null ? stockInfo.Wheels_Location : zdpInfo.Zdp_Location,
                TaskNum = taskNo,
                TargetAddress = emptyLocation.LocationCode,
                TaskState = (int)TaskStatus.Created,
                TaskType = (int)TaskTypeEnum.Relocation,
                Dispatchertime = DateTime.Now,
            };
            LogFactory.GetLog("检查是否需要移库").InfoFormat(true, "需要移库,新建移库任务", $"移库任务数据：{newTransferTask}");
                LogFactory.GetLog("检查是否需要移库").InfoFormat(true, "需要移库,未获取到库存数据", $"直接返回原先出库任务：{outboundTask}");
                // å¦‚果没有库存，直接返回当前出库任务
                return outboundTask;
            }
            else
            {
                // å¦‚果有库存，生成移库任务
                var emptyLocation = RequestLocation("SC1");
                if (emptyLocation == null) throw new Exception("暂无空库");

            //修改库位状态
            emptyLocation.LocationStatus = (int)LocationEnum.FreeDisable;
            BaseDal.UpdateData(emptyLocation);
                LogFactory.GetLog("检查是否需要移库").InfoFormat(true, "需要移库,查找能移库货位", $"货位数据：{emptyLocation}");
                var taskNo = await _taskRepository.GetTaskNo();
                Dt_Task newTransferTask = new Dt_Task()
                {
                    CreateDate = DateTime.Now,
                    Creater = App.User.UserName == null ? "admin" : App.User.UserName,
                    CurrentAddress = stockInfo != null ? stockInfo.Wheels_Location : zdpInfo.Zdp_Location,
                    Grade = 99,
                    MaterialNo = stockInfo != null ? stockInfo.Wheels_Type : "2",
                    NextAddress = emptyLocation.LocationCode,
                    PalletCode = stockInfo != null ? stockInfo.Wheels_Num : zdpInfo.Zdp_code,
                    Remark = "移库",
                    Roadway = "SC1",
                    SourceAddress = stockInfo != null ? stockInfo.Wheels_Location : zdpInfo.Zdp_Location,
                    TaskNum = taskNo,
                    TargetAddress = emptyLocation.LocationCode,
                    TaskState = (int)TaskStatus.Created,
                    TaskType = (int)TaskTypeEnum.Relocation,
                    Dispatchertime = DateTime.Now,
                };
                LogFactory.GetLog("检查是否需要移库").InfoFormat(true, "需要移库,新建移库任务", $"移库任务数据：{newTransferTask.ToJson()}");

            return await _taskRepository.Create(newTransferTask);
                // èŽ·å–新的库位的任务
                var internalTransferTask = await _taskRepository.QueryFirstAsync(x => x.SourceAddress == newLocationID && x.Roadway == outboundTask.Roadway && x.TaskState == (int)TaskOutStatusEnum.OutNew);
                if (internalTransferTask != null)
                {
                    internalTransferTask.SourceAddress = emptyLocation.LocationCode;
                    internalTransferTask.CurrentAddress = emptyLocation.LocationCode;
                    await _taskRepository.Update(internalTransferTask);
                }

                //修改库位状态
                emptyLocation.LocationStatus = (int)LocationEnum.FreeDisable;
                BaseDal.UpdateData(emptyLocation);

                return await _taskRepository.Create(newTransferTask);
            }
        }
        catch (Exception ex)
        {
            LogFactory.GetLog("检查是否需要移库").InfoFormat(true, "方法：HandleNoTaskAtLocation", $"出错，原因：{ex.ToJson()}");
            throw;
        }
    }


 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs

@@ -943,8 +943,25 @@
            //判断任务类型
            // æ ¹æ®ä»»åŠ¡ç±»åž‹è°ƒç”¨ç›¸åº”的完成任务方法

            //调取删除wcs任务
            var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
            var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
            var ReceiveByWMSTask = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.DelteWCSTask)?.ConfigValue;
            if (ReceiveByWMSTask == null || ipAddress == null)
            {
                throw new Exception("WMS IP æœªé…ç½®");
            }
            var wmsIpAddrss = ipAddress + ReceiveByWMSTask;

            var respon = HttpHelper.Post(wmsIpAddrss, JsonConvert.SerializeObject(task.TaskNum));

            if (respon == null) return content.Error("WCS处理失败");

            WebResponseContent respone = JsonConvert.DeserializeObject<WebResponseContent>(respon.ToString());
            if (!respone.Status) return content.Error($"删除wcs任务失败，原因=》{content.Message}");

            // éªŒè¯åº“存是否存在
            if(task.TaskState== (int)TaskInStatusEnum.InAbnormalCompletion || task.TaskState == (int)TaskOutStatusEnum.OutAbnormalCompletion)
            if (task.TaskState== (int)TaskInStatusEnum.InAbnormalCompletion || task.TaskState == (int)TaskOutStatusEnum.OutAbnormalCompletion)
            {
                var taskHtyNG2 = CreateHistoricalTask(task, true);


 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs

@@ -41,8 +41,8 @@
builder.Services.AddAllOptionRegister();//读取配置文件
builder.Services.AddMemoryCacheSetup();//缓存
builder.Services.AddSqlsugarSetup();//SqlSugar å¯åŠ¨æœåŠ¡
builder.Services.AddInitializationHostServiceSetup();//应用初始化服务注入
builder.Services.AddDbSetup();//Db å¯åŠ¨æœåŠ¡
//builder.Services.AddInitializationHostServiceSetup();//应用初始化服务注入
//builder.Services.AddDbSetup();//Db å¯åŠ¨æœåŠ¡
 
//todo åˆå§‹åŒ–模型验证配置
//builder.Services.UseMethodsModelParameters().UseMethodsGeneralParameters();

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json

@@ -11,7 +11,10 @@
  //连接字符串
  //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
  //"ConnectionString": "Data Source=192.168.5.251;Initial Catalog=WIDESEA_WMSDB_BBMain;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionString": "Data Source=.;Initial Catalog=ZCLDY_WIDESEAWMS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  "ConnectionString": "Data Source=.;Initial Catalog=ZCLDY_WIDESEAWMS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  
  
  //"ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=MX_LDY_WMS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionString": "Data Source=192.168.20.251;Initial Catalog=WIDESEA_WMSDB;User ID=sa;Password=123456@gy;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionStringWCS": "Data Source=192.168.5.251;Initial Catalog=WIDESEAWCS_TEST;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",