Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

test

9 小时以前 98e221d6dc26183efab868ee5f11a65d5791304e

 Wms/Wms/Controllers/BllSoController.cs

@@ -76,7 +76,7 @@
        {
            try
            {
                var bolls = _exNoticeSvc.GetStockGroupList(model.Type,model.OwnerNo,model.Msg);
                var bolls = _exNoticeSvc.GetStockGroupList(model.WareHouseNo,model.Type,model.OwnerNo,model.Msg);

                return Ok(new { code = 0, count=0, msg = "出库单信息", data = bolls });
            }
@@ -582,11 +582,11 @@
        }

        [HttpGet]
        public IActionResult GetCompBoxInfoList( string boxNo,string boxNo3)
        public IActionResult GetCompBoxInfoList(string sONo, string boxNo,string boxNo3)
        {
            try
            {
                var bolls = _comDetailSvc.GetCompBoxInfoList(boxNo, boxNo3);
                var bolls = _comDetailSvc.GetCompBoxInfoList(sONo, boxNo, boxNo3);

                return Ok(new { code = 0, count = bolls.Count, msg = "拣货明细信息", data = bolls });
            }
@@ -638,12 +638,21 @@
                    return Ok(new { code = 1, msg = "未获取到当前操作人信息" });
                }
                //验证出库口
                //if (string.IsNullOrWhiteSpace(outMode))
                //{
                //    return Ok(new { code = 1, msg = "请选择出库口" });
                //}

                var list = _exNoticeSvc.IssuePalletNoOut(palletNo, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out string str);
                if (string.IsNullOrWhiteSpace(outMode))
                {
                    return Ok(new { code = 1, msg = "请选择出库口" });
                }
                string str = string.Empty;
                var list = new List<OutCommandDto>();
                if (outMode == "17" || outMode == "18")
                {
                    list = _exNoticeSvc.IssuePalletNoOutMk(palletNo, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out str);
                }
                else
                {
                    list = _exNoticeSvc.IssuePalletNoOut(palletNo, outMode, int.Parse(userId), _config.WcsHost + _config.IssueComApiUrl, out str);
                }
                 

                return Ok(new { code = 0, msg = str, data = list });

@@ -703,7 +712,7 @@
        {
            try
            {
                var type = new List<string>(){"1","4"};
                var type = new List<string>(){"1"};
                RefAsync<int> count = new RefAsync<int>();
                var bolls = await _taskSvc.GetTaskList( type, model.Type,model.Status,model.TaskNo,model.IsSuccess,model.PalletNo,model.Msg,model.Page, model.Limit, count);