Merge branch 'xiaoyang' into dev

wanshenmean

14 小时以前 2db17e312a9bf0cff60917104447260b86178ca2

 Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WCS/TaskService_Inbound.cs

@@ -188,7 +188,7 @@
                            EquipmentCode = equipmentCode,
                            ResourceCode = resourceCode,
                            LocalTime = DateTime.Now,
                            ContainerCode = taskDto.PalletCode
                            ContainerCode = taskDto.PalletCode,
                        };
                        string requestJson = inboundRequest.ToJson();
                        var palletCode = taskDto.PalletCode;
@@ -206,7 +206,8 @@
                                return (
                                    result?.Data?.IsSuccess ?? false,
                                    JsonConvert.SerializeObject(result),
                                    result?.Data?.Msg ?? result?.ErrorMessage ?? "未知错误"
                                    result?.Data?.Msg ?? result?.ErrorMessage ?? "未知错误",
                                    _mesService.BuildConfig(token ?? string.Empty).ToJson()
                                );
                            });