Merge branch 'csc'

chengsc

8 天以前 c9fe2c53364abe0e0e495a1b756267f865159e2e

 Wms/Wms/Controllers/BllAsnController.cs

@@ -16,6 +16,9 @@
using System.Diagnostics;
using Model.ModelDto.SysDto;
using static System.Reflection.Metadata.BlobBuilder;
using WMS.DAL;
using static System.Net.WebRequestMethods;
using WMS.IBLL;

namespace Wms.Controllers
{
@@ -35,10 +38,11 @@
        private readonly IBllLabelBoxNoServer _labelBox;                            // 箱码标签
        private readonly IProcurePlanServer _procurePlanSvc;                            // 箱码标签
        private readonly IPalletUpShelfServer _palletUpShelfSvc;                            // 上架记录
        private readonly IHttpServer _http;
        #endregion

        #region 构造函数
        public BllAsnController(IArrivalNoticeServer arrivalNoticeSvc, IPalletBindServer palletBindSvc, IBllBoxInfoServer bllBoxInfoSvc, ITaskServer taskSvc, IOperationASNServer logSvc, IPalletUnbindServer palletUnbind, IAuditLogServer auditLog, IBllLabelBoxNoServer labelBox, IProcurePlanServer procurePlanSvc, IPalletUpShelfServer palletUpShelfSvc)
        public BllAsnController(IArrivalNoticeServer arrivalNoticeSvc, IPalletBindServer palletBindSvc, IBllBoxInfoServer bllBoxInfoSvc, ITaskServer taskSvc, IOperationASNServer logSvc, IPalletUnbindServer palletUnbind, IAuditLogServer auditLog, IBllLabelBoxNoServer labelBox, IProcurePlanServer procurePlanSvc, IPalletUpShelfServer palletUpShelfSvc, IHttpServer http)
        {
            _arrivalNoticeSvc = arrivalNoticeSvc;
            _PalletBindSvc = palletBindSvc;
@@ -50,6 +54,8 @@
            _labelBox = labelBox;
            _procurePlanSvc = procurePlanSvc;
            _palletUpShelfSvc = palletUpShelfSvc;

            _http = http;
        }
        #endregion

@@ -63,6 +69,7 @@
        [ServiceFilter(typeof(ApiResponseActionFilter))]
        public async Task<SqlSugarPagedList> GetArrivalNoticeList(ArrivalNoticeVm model)
        {
            var models = Common.GetCarPath("141401", "040401", 1,"1");

            RefAsync<int> count = new RefAsync<int>();
            var bolls = await _arrivalNoticeSvc.GetArrivalNoticeList(model, count);
@@ -758,8 +765,8 @@
                {
                    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                }
                _PalletBindSvc.ArrivalSuccessBack(taskNo, int.Parse(userId));

                //_PalletBindSvc.ArrivalSuccessBack(taskNo, int.Parse(userId));
                _http.ArrivalSuccess2(taskNo, int.Parse(userId));
                return Ok(new { code = 0, msg = "成功完成任务", data = "" });