Merge branch 'master' of http://120.77.11.229:3000/zuolinhao/ZT-FJ-WMS

wms.service/Service/FJService.cs

@@ -405,8 +405,7 @@ namespace wms.service.Service
             var procode = string.Join('|', reqDto.FeedList.Select(p => p.InMaterialCode).OrderBy(p => p).ToList());
             if (reqDto.ProdFlag == 1)
             {
-                var bominfo =
-                    _billBominfoRepository.GetFirst(p => p.Code == reqDto.FeedCode && p.ProMatCode == reqDto.MatCode);
+                var bominfo =_billBominfoRepository.GetFirst(p => p.Code == reqDto.FeedCode && p.ProMatCode == reqDto.MatCode);
                 if (bominfo == null)
                 {
                     res.ResCode = ResponseStatusCodeEnum.ErrParam.GetHashCode();
@@ -3976,7 +3975,7 @@ namespace wms.service.Service
             if (!wareList.Any()) //当前订单没有对应仓库信息
             {
                 res.ResCode = ResponseStatusCodeEnum.Fail.GetHashCode();
-                res.ResMsg = stack.Code + "垛型没有配置机台信息";
+                res.ResMsg =  $"条码:[{reqDto.SpoolCode}]对应的垛型[{stack.Code}]没有配置机台信息";
                 var error = new BaseErrorInfo
                 {
                     BusName = "湿拉下盘注册",