Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbany...

647556386

2025-12-22 a48729d8fb975f28e7348dbd5e53a5449628c549

Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/config/buttons.js

@@ -250,6 +250,22 @@
    type: 'primary',
    onClick: function () {
    }
},{
    name: "整单出库",
    // icon: 'el-icon-upload2',
    class: '',
    value: 'DirectOutbound',
    type: 'primary',
    onClick: function () {
    }
},{
    name: "完成任务",
    // icon: 'el-icon-upload2',
    class: '',
    value: 'HandleComplete',
    type: 'primary',
    onClick: function () {
    }
}
,{
    name: "整单出库",

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js

@@ -348,10 +348,10 @@
            .post(`api/MesFeedback/OutboundFeedback?orderNo=${selectedRows[0].orderNo}`, {}, "数据处理中...")
            .then((x) => {
              if (x.status) {
                _this.$Message.success('分批出库回调完成');
                _this.$Message.success(x.message);
                _this.refresh();
              } else {
                return _this.$Message.error('分批出库回调失败');
                return _this.$Message.error(x.message);
              }
            })
            .catch((error) => {

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/taskinfo/task.js

@@ -43,6 +43,31 @@
    methods: {
       //下面这些方法可以保留也可以删除
      onInit() {  
        var HandleCompleteBtn = this.buttons.find(
        (x) => x.value == "HandleComplete"
      );
      if (HandleCompleteBtn != null) {
        HandleCompleteBtn.onClick = () => {
          var rows = this.$refs.table.getSelected();
          // æ ¡éªŒæ˜¯å¦æœ‰é€‰ä¸­æ•°æ®
          if (!rows || rows.length === 0) {
            return this.$Message.warning("请先选择需要完成的任务");
          }
          this.http.get(`api/Task/HandCompleteTask?TaskNum=${rows[0].taskNum}`,{},"数据处理中...")
            .then((x) => {
              if (x.status) {
                this.$Message.success("任务完成成功");
                this.refresh();
              } else {
                return this.$Message.error(x.message);
              }
            })
            .catch((error) => {
              // å¢žåŠ å¼‚常捕获，处理网络错误等情况
              //_this.$Message.error('请求失败：' + (error.message || '未知错误'));
            });
        };
      }
        let TaskHandCancelBtn = this.buttons.find(x => x.value == 'TaskHandCancel');
      if (TaskHandCancelBtn) {
        TaskHandCancelBtn.onClick = function () {

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs

@@ -75,5 +75,7 @@
        /// <param name="allocateDto"></param>
        /// <returns></returns>
        HttpResponseResult<MesResponseDTO> responseModel(Dt_InboundOrder order, int InterfaceType, FeedbackInboundRequestModel model = null, AllocateDto allocateDto = null);

        Task<WebResponseContent> HandCompleteTask(string TaskNum);
    }
}

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -1844,5 +1844,10 @@
            }
        }

        public Task<WebResponseContent> HandCompleteTask(string TaskNum)
        {
            return TaskCompleted(TaskNum);
        }

    }
}

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs

@@ -120,6 +120,10 @@
            return await Service.TakeOutbound(stockViews, outStation);
        }


        [HttpPost, HttpGet, Route("HandCompleteTask"), AllowAnonymous]
        public async Task<WebResponseContent> HandCompleteTask(string TaskNum)
        {
            return await Service.HandCompleteTask(TaskNum);
        }
    }
}