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

wms.service/Service/FJService.cs

@@ -2017,6 +2017,11 @@ namespace wms.service.Service
             }
 
             var mac = _basemachinforepository.GetFirst(x => x.MachNo == reqDto.LocCode);
+            if (mac == null)
+            {
+                res.ResMsg = $"找不到对应机台号{reqDto.LocCode}";
+                return res;
+            }
 
             try
             {